Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 42040:02fa567f8a3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make "labels" argument to graft() optional, like it is for update() graft() just passes the argument on to update(), and update() doesn't require it, so graft() shouldn't either. Differential Revision: https://phab.mercurial-scm.org/D6175
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 30 Mar 2019 13:13:10 -0700
parents aaad36b88298
children 566daffc607d
comparison
equal deleted inserted replaced
42039:cab19d49f8bd 42040:02fa567f8a3c
2203 if not partial: 2203 if not partial:
2204 repo.hook('update', parent1=xp1, parent2=xp2, 2204 repo.hook('update', parent1=xp1, parent2=xp2,
2205 error=stats.unresolvedcount) 2205 error=stats.unresolvedcount)
2206 return stats 2206 return stats
2207 2207
2208 def graft(repo, ctx, pctx, labels, keepparent=False, 2208 def graft(repo, ctx, pctx, labels=None, keepparent=False,
2209 keepconflictparent=False): 2209 keepconflictparent=False):
2210 """Do a graft-like merge. 2210 """Do a graft-like merge.
2211 2211
2212 This is a merge where the merge ancestor is chosen such that one 2212 This is a merge where the merge ancestor is chosen such that one
2213 or more changesets are grafted onto the current changeset. In 2213 or more changesets are grafted onto the current changeset. In