This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8166

merge: change default of hg.merge()'s "force" argument from None to False
ClosedPublic

Authored by martinvonz on Feb 26 2020, 2:14 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0f60687b2324: merge: change default of hg.merge()'s "force" argument from None to False
Summary

The argument is only passed to mergemode.update(), and that function
treats None just like False, so False seems clearer.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (2 lines)

Diff 20365

mercurial/hg.py

if warndest: if warndest:
destutil.statusotherdests(ui, repo) destutil.statusotherdests(ui, repo)
return ret return ret
def merge( def merge(
repo, node, force=None, remind=True, mergeforce=False, labels=None, repo, node, force=False, remind=True, mergeforce=False, labels=None,
): ):
"""Branch merge with node, resolving changes. Return true if any """Branch merge with node, resolving changes. Return true if any
unresolved conflicts.""" unresolved conflicts."""
stats = mergemod.update( stats = mergemod.update(
repo, repo,
node, node,
branchmerge=True, branchmerge=True,
force=force, force=force,