Patchwork D6175: merge: make "labels" argument to graft() optional, like it is for update()

login
register
mail settings
Submitter phabricator
Date March 31, 2019, 10:32 p.m.
Message ID <ea57e7b013125613a29e18ce431e7682@localhost.localdomain>
Download mbox | patch
Permalink /patch/39431/
State Not Applicable
Headers show

Comments

phabricator - March 31, 2019, 10:32 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG02fa567f8a3c: merge: make &quot;labels&quot; argument to graft() optional, like it is for update() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6175?vs=14609&id=14612

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2205,7 +2205,7 @@ 
                   error=stats.unresolvedcount)
     return stats
 
-def graft(repo, ctx, pctx, labels, keepparent=False,
+def graft(repo, ctx, pctx, labels=None, keepparent=False,
           keepconflictparent=False):
     """Do a graft-like merge.