This is an archive of the discontinued Mercurial Phabricator instance.

	if not branchmerge:			if not branchmerge:
	sparse.prunetemporaryincludes(repo)			sparse.prunetemporaryincludes(repo)

	if not partial:			if not partial:
	repo.hook('update', parent1=xp1, parent2=xp2,			repo.hook('update', parent1=xp1, parent2=xp2,
	error=stats.unresolvedcount)			error=stats.unresolvedcount)
	return stats			return stats

	def graft(repo, ctx, pctx, labels, keepparent=False,			def graft(repo, ctx, pctx, labels=None, keepparent=False,
	keepconflictparent=False):			keepconflictparent=False):
	"""Do a graft-like merge.			"""Do a graft-like merge.

	This is a merge where the merge ancestor is chosen such that one			This is a merge where the merge ancestor is chosen such that one
	or more changesets are grafted onto the current changeset. In			or more changesets are grafted onto the current changeset. In
	addition to the merge, this fixes up the dirstate to include only			addition to the merge, this fixes up the dirstate to include only
	a single parent (if keepparent is False) and tries to duplicate any			a single parent (if keepparent is False) and tries to duplicate any
	renames/copies appropriately.			renames/copies appropriately.

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