This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10149

commit: get info from mergestate whether a file was merged or not
ClosedPublic

Authored by pulkit on Mar 10 2021, 4:04 AM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG5a0b930cfb3e: commit: get info from mergestate whether a file was merged or not

Summary

While commiting a merge, the commit code does not know whether a file was merged
during hg merge or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.

From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 10 2021, 4:04 AM

Herald added a reviewer: durin42. · View Herald TranscriptMar 10 2021, 4:04 AM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D10218: test-copies: show some wrong ChangedFiles upgrade.Mar 15 2021, 10:19 AM

marmoute updated this revision to Diff 26361.

Needs rebased.

This revision now requires changes to proceed.Mar 17 2021, 1:44 PM

pulkit updated this revision to Diff 26516.Mar 19 2021, 4:36 PM

pulkit added a commit: rHG5a0b930cfb3e: commit: get info from mergestate whether a file was merged or not.Mar 22 2021, 2:29 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG5a0b930cfb3e: commit: get info from mergestate whether a file was merged or not (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commit.py (2 lines)
M			mercurial/merge.py (2 lines)
M			tests/test-backout.t (1 line)
M			tests/test-copies-chain-merge.t (26 lines)
M			tests/test-histedit-non-commute-abort.t (1 line)
M			tests/test-merge-changedelete.t (42 lines)
M			tests/test-merge-criss-cross.t (8 lines)
M			tests/test-obsolete.t (1 line)
M			tests/test-rebase-abort.t (1 line)
M			tests/test-resolve.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26209		Mar 10 2021, 4:04 AM	★	★
Diff 2	26361		Mar 15 2021, 10:19 AM	★	★
Diff 3	26516		Mar 19 2021, 4:36 PM	★	★
Diff 4	26544	rHG5a0b930cfb3ee0dba307a80b0ca90b4ff4cfb823	Mar 10 2021, 2:44 AM	★	★

Status	Author	Revision
Closed	marmoute	D10220 copies: distinguish between merged and touched files during upgrade
Closed	marmoute	D10219 copies: detect files as `touched/salvaged` if they only existed on one side
Closed	marmoute	D10088 test-copies: add a test updating file content while salvaging it
Closed	marmoute	D10218 test-copies: show some wrong ChangedFiles upgrade
Closed	pulkit	D10149 commit: get info from mergestate whether a file was merged or not
Closed	marmoute	D10087 test-copies: add a test updating file content while merging a pure overwrite
Closed	pulkit	D10148 mergestate: don't pop stateextras when there are no conflicts on filemerge
Closed	pulkit	D10147 commit: reorder if-else conditional to give mergestate info priority

Diff 26544

mercurial/commit.py

	% (fname, cfname)			% (fname, cfname)
	)			)

	elif fparent1 == nullid:			elif fparent1 == nullid:
	fparent1, fparent2 = fparent2, nullid			fparent1, fparent2 = fparent2, nullid
	elif fparent2 != nullid:			elif fparent2 != nullid:
	if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other':			if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other':
	fparent1, fparent2 = fparent2, nullid			fparent1, fparent2 = fparent2, nullid
				elif ms.active() and ms.extras(fname).get(b'merged') != b'yes':
				fparent1, fparent2 = fparent1, nullid
	# is one parent an ancestor of the other?			# is one parent an ancestor of the other?
	else:			else:
	fparentancestors = flog.commonancestorsheads(fparent1, fparent2)			fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
	if fparent1 in fparentancestors:			if fparent1 in fparentancestors:
	fparent1, fparent2 = fparent2, nullid			fparent1, fparent2 = fparent2, nullid
	elif fparent2 in fparentancestors:			elif fparent2 in fparentancestors:
	fparent2 = nullid			fparent2 = nullid

mercurial/merge.py

	)			)
	)			)

	try:			try:
	# premerge			# premerge
	tocomplete = []			tocomplete = []
	for f, args, msg in mergeactions:			for f, args, msg in mergeactions:
	repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))			repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))
				ms.addcommitinfo(f, {b'merged': b'yes'})
	progress.increment(item=f)			progress.increment(item=f)
	if f == b'.hgsubstate': # subrepo states need updating			if f == b'.hgsubstate': # subrepo states need updating
	subrepoutil.submerge(			subrepoutil.submerge(
	repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels			repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels
	)			)
	continue			continue
	wctx[f].audit()			wctx[f].audit()
	complete, r = ms.preresolve(f, wctx)			complete, r = ms.preresolve(f, wctx)
	if not complete:			if not complete:
	numupdates += 1			numupdates += 1
	tocomplete.append((f, args, msg))			tocomplete.append((f, args, msg))

	# merge			# merge
	for f, args, msg in tocomplete:			for f, args, msg in tocomplete:
	repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))			repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))
				ms.addcommitinfo(f, {b'merged': b'yes'})
	progress.increment(item=f, total=numupdates)			progress.increment(item=f, total=numupdates)
	ms.resolve(f, wctx)			ms.resolve(f, wctx)

	finally:			finally:
	ms.commit()			ms.commit()

	unresolved = ms.unresolvedcount()			unresolved = ms.unresolvedcount()

tests/test-backout.t

	v1 and v2 states match: using v2			v1 and v2 states match: using v2
	local: b71750c4b0fdf719734971e3ef90dbeab5919a2d			local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
	other: a30dd8addae3ce71b8667868478542bc417439e6			other: a30dd8addae3ce71b8667868478542bc417439e6
	file: foo (state "u")			file: foo (state "u")
	local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")			local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
	ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)			ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
	other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)			other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
	extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553			extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
				extra: merged = yes
	$ mv .hg/merge/state2 .hg/merge/state2-moved			$ mv .hg/merge/state2 .hg/merge/state2-moved
	$ hg debugmergestate -v			$ hg debugmergestate -v
	no version 2 merge state			no version 2 merge state
	local: b71750c4b0fdf719734971e3ef90dbeab5919a2d			local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
	other: b71750c4b0fdf719734971e3ef90dbeab5919a2d			other: b71750c4b0fdf719734971e3ef90dbeab5919a2d
	file: foo (state "u")			file: foo (state "u")
	local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")			local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
	ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)			ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)

tests/test-copies-chain-merge.t

	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("b-1")'			$ hg merge 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ echo "extra-change to (formelly h) during the merge" > d			$ echo "extra-change to (formelly h) during the merge" > d
	$ hg ci -m "mFB-change-m-0 $case_desc - the other way"			$ hg ci -m "mFB-change-m-0 $case_desc - the other way"
	created new head			created new head
	$ hg manifest --rev . --debug \| grep " d"			$ hg manifest --rev . --debug \| grep " d"
	1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset missing-correct-output !)			1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !)
	646ed7992dec41eb29635ab28268e7867d0e59a0 644 d (no-changeset known-bad-output !)
	cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !)			cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !)
	#if no-changeset			#if no-changeset
	$ hg debugindex d \| ../no-linkrev			$ hg debugindex d \| ../no-linkrev
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 * d8252ab2e760 000000000000 000000000000			0 * d8252ab2e760 000000000000 000000000000
	1 * b004912a8510 000000000000 000000000000			1 * b004912a8510 000000000000 000000000000
	2 * 7b79e2fe0c89 000000000000 000000000000			2 * 7b79e2fe0c89 000000000000 000000000000
	3 * 17ec97e60577 d8252ab2e760 000000000000			3 * 17ec97e60577 d8252ab2e760 000000000000
	4 * 06dabf50734c b004912a8510 17ec97e60577			4 * 06dabf50734c b004912a8510 17ec97e60577
	5 * 19c0e3924691 17ec97e60577 b004912a8510			5 * 19c0e3924691 17ec97e60577 b004912a8510
	6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577			6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577
	7 * d55cb4e9ef57 000000000000 000000000000			7 * d55cb4e9ef57 000000000000 000000000000
	8 * 1c334238bd42 7b79e2fe0c89 000000000000			8 * 1c334238bd42 7b79e2fe0c89 000000000000
	9 * 646ed7992dec 7b79e2fe0c89 d8252ab2e760 (known-bad-output !)
	#else			#else
	$ hg debugindex d \| ../no-linkrev			$ hg debugindex d \| ../no-linkrev
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 * ae258f702dfe 000000000000 000000000000			0 * ae258f702dfe 000000000000 000000000000
	1 * b004912a8510 000000000000 000000000000			1 * b004912a8510 000000000000 000000000000
	2 * 5cce88bf349f ae258f702dfe 000000000000			2 * 5cce88bf349f ae258f702dfe 000000000000
	3 * cc269dd788c8 b004912a8510 5cce88bf349f			3 * cc269dd788c8 b004912a8510 5cce88bf349f
	4 * 51c91a115080 5cce88bf349f b004912a8510			4 * 51c91a115080 5cce88bf349f b004912a8510
	merged : d, ; (upgraded known-bad-output !)			merged : d, ; (upgraded known-bad-output !)
	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
	touched : d, ; (upgraded-parallel missing-correct-output !)			touched : d, ; (upgraded-parallel missing-correct-output !)
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)			'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
	merged : d, ; (upgraded-parallel known-bad-output !)			merged : d, ; (upgraded-parallel known-bad-output !)
	##### revision "mFB-change-m-0 merge with extra change - B side" #####			##### revision "mFB-change-m-0 merge with extra change - B side" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 14			entry-0014 size 14
	'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (known-bad-output !)			'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)
	merged : d, ; (known-bad-output !)			touched : d, ; (no-upgraded no-upgraded-parallel !)
	'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (missing-correct-output !)			'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
	touched : d, ; (missing-correct-output !)			merged : d, ; (upgraded-parallel known-bad-output !)
				'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
				merged : d, ; (upgraded known-bad-output !)
	##### revision "j-1" #####			##### revision "j-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'			'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
	added : unrelated-j, ;			added : unrelated-j, ;
	##### revision "k-1" #####			##### revision "k-1" #####
	1 sidedata entries			1 sidedata entries
	entry-0014 size 24			entry-0014 size 24
	A t			A t
	p			p
	R a			R a
	R h			R h
	R p			R p
	$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")'			$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFB-change-m-0")'
	M b			M b
	A d			A d
	h (filelog missing-correct-output !)			h
	a (filelog known-bad-output !)
	h (sidedata !)
	h (upgraded !)
	h (upgraded-parallel !)
	h (changeset !)
	h (compatibility !)
	A t			A t
	p			p
	R a			R a
	R h			R h
	R p			R p
	$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBF-change-m-0")'			$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBF-change-m-0")'
	M d			M d
	h (no-filelog !)			h (no-filelog !)
	#if no-changeset			#if no-changeset
	$ hg log -Gfr 'desc("mFB-change-m-0")' d			$ hg log -Gfr 'desc("mFB-change-m-0")' d
	o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way			o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
	\|\			\|\
	o : f-2: rename i -> d			o : f-2: rename i -> d
	\| :			\| :
	o : f-1: rename h -> i			o : f-1: rename h -> i
	:/			:/
	o i-2: c -move-> d, s -move-> t (known-bad-output !)
	\| (known-bad-output !)
	o i-1: a -move-> c, p -move-> s (known-bad-output !)
	\| (known-bad-output !)
	o i-0 initial commit: a b h p q r			o i-0 initial commit: a b h p q r

	#else			#else
	BROKEN: `hg log --follow <file>` relies on filelog metadata to work			BROKEN: `hg log --follow <file>` relies on filelog metadata to work
	$ hg log -Gfr 'desc("mFB-change-m-0")' d			$ hg log -Gfr 'desc("mFB-change-m-0")' d
	o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way			o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
	:			:
	o i-2: c -move-> d, s -move-> t			o i-2: c -move-> d, s -move-> t

tests/test-histedit-non-commute-abort.t

	$ hg debugmergestate			$ hg debugmergestate
	local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758			local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
	other (histedit): e860deea161a2f77de56603b340ebbb4536308ae			other (histedit): e860deea161a2f77de56603b340ebbb4536308ae
	file: e (state "u")			file: e (state "u")
	local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")			local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")
	ancestor path: e (node 0000000000000000000000000000000000000000)			ancestor path: e (node 0000000000000000000000000000000000000000)
	other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)			other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
	extra: ancestorlinknode = 0000000000000000000000000000000000000000			extra: ancestorlinknode = 0000000000000000000000000000000000000000
				extra: merged = yes
	$ hg resolve -l			$ hg resolve -l
	U e			U e

	insert unsupported mandatory merge record			insert unsupported mandatory merge record
	$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X			$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
	$ hg debugmergestate			$ hg debugmergestate
	abort: unsupported merge state records: X			abort: unsupported merge state records: X
	(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)			(see https://mercurial-scm.org/wiki/MergeStateRecords for more information)

tests/test-merge-changedelete.t

	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	*** file2 does not exist			*** file2 does not exist
	--- file3 ---			--- file3 ---
	3			3
	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...			<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
	changed2			changed2
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	*** file1 does not exist			*** file1 does not exist
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...			<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
	changed2			changed2
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	*** file1 does not exist			*** file1 does not exist
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...			<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
	changed2			changed2
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "r")			file: file3 (state "r")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	*** file2 does not exist			*** file2 does not exist
	--- file3 ---			--- file3 ---
	3			3
	changed2			changed2

	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "r")			file: file3 (state "r")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	*** file1 does not exist			*** file1 does not exist
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	changed1			changed1

	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4			local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
	other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	file: file3 (state "u")			file: file3 (state "u")
	local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")			local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
	ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)			ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
	other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)			other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	*** file2 does not exist			*** file2 does not exist
	--- file3 ---			--- file3 ---
	3			3
	changed1			changed1

	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "r")			file: file2 (state "r")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	*** file1 does not exist			*** file1 does not exist
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	changed1			changed1

	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	--- debugmergestate ---			--- debugmergestate ---
	local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff			local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
	other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6			other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
	file: file1 (state "u")			file: file1 (state "u")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)			ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
	other path: file1 (node 0000000000000000000000000000000000000000)			other path: file1 (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash 0000000000000000000000000000000000000000, flags "")			local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)			ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
	other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)			other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
	extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff			extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
				extra: merged = yes
	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3

tests/test-merge-criss-cross.t

	local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b			local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
	other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071			other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
	file: the-file (state "r")			file: the-file (state "r")
	local path: the-file (hash 0000000000000000000000000000000000000000, flags "")			local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)			ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
	other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589			extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	extra: other-file (filenode-source = other)			extra: other-file (filenode-source = other)
	$ hg ci -m "merge-deleting-the-file-from-deleted"			$ hg ci -m "merge-deleting-the-file-from-deleted"
	$ hg manifest			$ hg manifest
	other-file			other-file
	$ hg debugrevlogindex the-file			$ hg debugrevlogindex the-file
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 0 4b69178b9bda 000000000000 000000000000			0 0 4b69178b9bda 000000000000 000000000000
	1 1 59e363a07dc8 4b69178b9bda 000000000000			1 1 59e363a07dc8 4b69178b9bda 000000000000

	$ hg update 'desc("updating-both-file")'			$ hg update 'desc("updating-both-file")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("delete-the-file")' -t :other			$ hg merge 'desc("delete-the-file")' -t :other
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071			local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
	other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b			other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
	file: the-file (state "r")			file: the-file (state "r")
	local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")			local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
	ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)			ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
	other path: the-file (node 0000000000000000000000000000000000000000)			other path: the-file (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589			extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	$ hg ci -m "merge-deleting-the-file-from-updated"			$ hg ci -m "merge-deleting-the-file-from-updated"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
	$ hg debugrevlogindex the-file			$ hg debugrevlogindex the-file
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 0 4b69178b9bda 000000000000 000000000000			0 0 4b69178b9bda 000000000000 000000000000
	1 1 59e363a07dc8 4b69178b9bda 000000000000			1 1 59e363a07dc8 4b69178b9bda 000000000000

	$ hg update 'desc("delete-the-file")'			$ hg update 'desc("delete-the-file")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("updating-both-file")' -t :other			$ hg merge 'desc("updating-both-file")' -t :other
	1 files updated, 1 files merged, 0 files removed, 0 files unresolved			1 files updated, 1 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b			local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
	other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071			other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
	file: the-file (state "r")			file: the-file (state "r")
	local path: the-file (hash 0000000000000000000000000000000000000000, flags "")			local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)			ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
	other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589			extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	extra: other-file (filenode-source = other)			extra: other-file (filenode-source = other)
	$ hg ci -m "merge-keeping-the-file-from-deleted"			$ hg ci -m "merge-keeping-the-file-from-deleted"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
	the-file			the-file

	$ hg debugrevlogindex the-file			$ hg debugrevlogindex the-file
	local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071			local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
	other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b			other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
	file: the-file (state "r")			file: the-file (state "r")
	local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")			local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
	ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)			ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
	other path: the-file (node 0000000000000000000000000000000000000000)			other path: the-file (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589			extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	$ hg ci -m "merge-keeping-the-file-from-updated"			$ hg ci -m "merge-keeping-the-file-from-updated"
	created new head			created new head
	$ hg manifest			$ hg manifest
	other-file			other-file
	the-file			the-file

	XXX: This should create a new filenode because user explicitly decided to keep			XXX: This should create a new filenode because user explicitly decided to keep
	the file. If we reuse the same filenode, future merges (criss-cross ones mostly)			the file. If we reuse the same filenode, future merges (criss-cross ones mostly)
	local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f			local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
	other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78			other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
	file: the-file (state "u")			file: the-file (state "u")
	local path: the-file (hash 0000000000000000000000000000000000000000, flags "")			local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	other path: the-file (node 885af55420b35d7bf3bbd6f546615295bfe6544a)			other path: the-file (node 885af55420b35d7bf3bbd6f546615295bfe6544a)
	extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071			extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	#else			#else
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f			local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
	other (merge rev): e9b7081317232edce73f7ad5ae0b7807ff5c326a			other (merge rev): e9b7081317232edce73f7ad5ae0b7807ff5c326a
	extra: the-file (merge-removal-candidate = yes)			extra: the-file (merge-removal-candidate = yes)
	#endif			#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e			local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e
	other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78			other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
	file: the-file (state "u")			file: the-file (state "u")
	local path: the-file (hash 0000000000000000000000000000000000000000, flags "")			local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
	ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	other path: the-file (node 885af55420b35d7bf3bbd6f546615295bfe6544a)			other path: the-file (node 885af55420b35d7bf3bbd6f546615295bfe6544a)
	extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071			extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	#else			#else
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e			local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e
	other (merge rev): e9b7081317232edce73f7ad5ae0b7807ff5c326a			other (merge rev): e9b7081317232edce73f7ad5ae0b7807ff5c326a
	extra: the-file (merge-removal-candidate = yes)			extra: the-file (merge-removal-candidate = yes)
	#endif			#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a (old !)			local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a (old !)
	other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f			other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
	file: the-file (state "u")			file: the-file (state "u")
	local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")			local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
	ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	other path: the-file (node 0000000000000000000000000000000000000000)			other path: the-file (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071			extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	#else			#else
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a			local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a
	other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f			other (merge rev): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
	extra: the-file (merge-removal-candidate = yes)			extra: the-file (merge-removal-candidate = yes)
	#endif			#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78			local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
	other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e			other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e
	file: the-file (state "u")			file: the-file (state "u")
	local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")			local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
	ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)			ancestor path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
	other path: the-file (node 0000000000000000000000000000000000000000)			other path: the-file (node 0000000000000000000000000000000000000000)
	extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071			extra: ancestorlinknode = 9b610631ab29024c5f44af7d2c19658ef8f8f071
	extra: merge-removal-candidate = yes			extra: merge-removal-candidate = yes
				extra: merged = yes
	#else			#else
	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a			local (working copy): e9b7081317232edce73f7ad5ae0b7807ff5c326a
	other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e			other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e
	extra: the-file (merge-removal-candidate = yes)			extra: the-file (merge-removal-candidate = yes)
	#endif			#endif

tests/test-obsolete.t

	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37			local (working copy): b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
	other (destination): f53e9479dce52f79c923908241fa54f7da90a7ad			other (destination): f53e9479dce52f79c923908241fa54f7da90a7ad
	file: file (state "u")			file: file (state "u")
	local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")			local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")
	ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)			ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)
	other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)			other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)
	extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37			extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
				extra: merged = yes
	We should be able to see the log (without the deleted commit, of course)			We should be able to see the log (without the deleted commit, of course)
	$ hg log -G			$ hg log -G
	@ 0:f53e9479dce5 (draft) [tip ] first			@ 0:f53e9479dce5 (draft) [tip ] first

	$ cd ..			$ cd ..

tests/test-rebase-abort.t

	$ hg debugmergestate			$ hg debugmergestate
	local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc			local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc
	other (source): 46f0b057b5c061d276b91491c22151f78698abd2			other (source): 46f0b057b5c061d276b91491c22151f78698abd2
	file: common (state "u")			file: common (state "u")
	local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "")			local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "")
	ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)			ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
	other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)			other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
	extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c			extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c
				extra: merged = yes
	$ hg resolve -l			$ hg resolve -l
	U common			U common

	Insert unsupported mandatory merge record:			Insert unsupported mandatory merge record:

	$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X			$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
	$ hg debugmergestate			$ hg debugmergestate
	abort: unsupported merge state records: X			abort: unsupported merge state records: X

tests/test-resolve.t

	$ hg debugmergestate			$ hg debugmergestate
	local (working copy): 57653b9f834a4493f7240b0681efcb9ae7cab745			local (working copy): 57653b9f834a4493f7240b0681efcb9ae7cab745
	other (merge rev): dc77451844e37f03f5c559e3b8529b2b48d381d1			other (merge rev): dc77451844e37f03f5c559e3b8529b2b48d381d1
	file: file1 (state "r")			file: file1 (state "r")
	local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")			local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
	ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)			ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
	other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)			other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
	extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac			extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
				extra: merged = yes
	file: file2 (state "u")			file: file2 (state "u")
	local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "")			local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "")
	ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)			ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
	other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)			other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
	extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac			extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
				extra: merged = yes
	$ hg resolve -l			$ hg resolve -l
	R file1			R file1
	U file2			U file2

	test json output			test json output

	$ hg debugmergestate -T json			$ hg debugmergestate -T json
	[			[
	{			{
	"commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],			"commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],
	"extras": [],			"extras": [],
	"files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]			"files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}, {"key": "merged", "value": "yes"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}, {"key": "merged", "value": "yes"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]
	}			}
	]			]


	insert unsupported mandatory merge record			insert unsupported mandatory merge record

	$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X			$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
	$ hg debugmergestate			$ hg debugmergestate