This is an archive of the discontinued Mercurial Phabricator instance.

	else:			else:
	partial = True			partial = True
	with repo.wlock():			with repo.wlock():
	if wc is None:			if wc is None:
	wc = repo[None]			wc = repo[None]
	pl = wc.parents()			pl = wc.parents()
	p1 = pl[0]			p1 = pl[0]
	p2 = repo[node]			p2 = repo[node]
	pas = [None]
	if ancestor is not None:			if ancestor is not None:
	pas = [repo[ancestor]]			pas = [repo[ancestor]]
	if pas[0] is None:			else:
	if repo.ui.configlist('merge', 'preferancestor') == ['*']:			if repo.ui.configlist('merge', 'preferancestor') == ['*']:
	cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())			cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
	pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]			pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
	else:			else:
	pas = [p1.ancestor(p2, warn=branchmerge)]			pas = [p1.ancestor(p2, warn=branchmerge)]

	fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)			fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)

merge: simplify initialization of "pas"ClosedPublic