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

login
register
mail settings
Submitter phabricator
Date Feb. 27, 2020, 6:30 p.m.
Message ID <4b6cb0344e9bc19c737274473c46bcce@localhost.localdomain>
Download mbox | patch
Permalink /patch/45370/
State Not Applicable
Headers show

Comments

phabricator - Feb. 27, 2020, 6:30 p.m.
Closed by commit rHG0f60687b2324: merge: change default of hg.merge()&#039;s &quot;force&quot; argument from None to False (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8166?vs=20342&id=20365

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8166/new/

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

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
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."""