This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D12119 narrow: allow merging non-conflicting change outside of the narrow spec
Closed	marmoute	D12118 merge-actions: add some information about the "changes" the action do
Closed	marmoute	D12117 merge-actions: have an attribute for narrow safetiness
Closed	marmoute	D12116 merge-actions: add an explicite "no_op" attribute
Closed	marmoute	D12115 merge-actions: gather all created action into a set
Closed	marmoute	D12114 merge-actions: make merge action a full featured object
Closed	marmoute	D12113 convert: use the merge action constant
Closed	marmoute	D12112 large-file: use the merge action constant
Closed	marmoute	D12111 merge: stop using merge action for pathconflict option
Closed	marmoute	D12110 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12109 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12108 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12107 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12106 merge: break up two not-so-one-liner for extra readability
Closed	marmoute	D12105 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12104 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12103 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12102 merge: break up a not-so-one-liner for readability
Closed	marmoute	D12101 merge: break up a not-so-one-liner for readability

Diff 32006

	# fix up dirstate for copies and renames			# fix up dirstate for copies and renames
	copies.graftcopies(wctx, ctx, base)			copies.graftcopies(wctx, ctx, base)
	return stats			return stats


	def back_out(ctx, parent=None, wc=None):			def back_out(ctx, parent=None, wc=None):
	if parent is None:			if parent is None:
	if ctx.p2() is not None:			if ctx.p2() is not None:
	raise error.ProgrammingError(			msg = b"must specify parent of merge commit to back out"
	b"must specify parent of merge commit to back out"			raise error.ProgrammingError(msg)
	)
	parent = ctx.p1()			parent = ctx.p1()
	return _update(			return _update(
	ctx.repo(),			ctx.repo(),
	parent,			parent,
	branchmerge=True,			branchmerge=True,
	force=True,			force=True,
	ancestor=ctx.node(),			ancestor=ctx.node(),
	mergeancestor=False,			mergeancestor=False,