D6175: merge: make "labels" argument to graft() optional, like it is for update()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Mar 31 18:32:11 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG02fa567f8a3c: merge: make "labels" 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
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.
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list