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 32004

	hint = _(b"use 'hg resolve' to resolve")			hint = _(b"use 'hg resolve' to resolve")
	raise error.StateError(msg, hint=hint)			raise error.StateError(msg, hint=hint)
	if branchmerge:			if branchmerge:
	m_a = _(b"merging with a working directory ancestor has no effect")			m_a = _(b"merging with a working directory ancestor has no effect")
	if pas == [p2]:			if pas == [p2]:
	raise error.Abort(m_a)			raise error.Abort(m_a)
	elif pas == [p1]:			elif pas == [p1]:
	if not mergeancestor and wc.branch() == p2.branch():			if not mergeancestor and wc.branch() == p2.branch():
	raise error.Abort(			msg = _(b"nothing to merge")
	_(b"nothing to merge"),			hint = _(b"use 'hg update' or check 'hg heads'")
	hint=_(b"use 'hg update' or check 'hg heads'"),			raise error.Abort(msg, hint=hint)
	)
	if not force and (wc.files() or wc.deleted()):			if not force and (wc.files() or wc.deleted()):
	raise error.StateError(			raise error.StateError(
	_(b"uncommitted changes"),			_(b"uncommitted changes"),
	hint=_(b"use 'hg status' to list changes"),			hint=_(b"use 'hg status' to list changes"),
	)			)
	if not wc.isinmemory():			if not wc.isinmemory():
	for s in sorted(wc.substate):			for s in sorted(wc.substate):
	wc.sub(s).bailifchanged()			wc.sub(s).bailifchanged()