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

login
register
mail settings
Submitter phabricator
Date Feb. 26, 2020, 7:14 p.m.
Message ID <differential-rev-PHID-DREV-xcwtjkd3anf25f6eyvn5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45348/
State Superseded
Headers show

Comments

phabricator - Feb. 26, 2020, 7:14 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8166

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1137,7 +1137,7 @@ 
 
 
 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
     unresolved conflicts."""