This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11855

mergestate: merge `preresolve()` into `resolve()`
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG38941a28406a: mergestate: merge `preresolve()` into `resolve()`

Summary

The separation between preresolve() and resolve() was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.

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

martinvonz created this revision.Dec 4 2021, 2:06 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 4 2021, 2:06 AM

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

martinvonz added a child revision: D11856: mergestate: make `_resolve()` do both preresolve and resolve.Dec 4 2021, 2:06 AM

Alphare accepted this revision.Dec 7 2021, 10:26 AM

This revision is now accepted and ready to land.Dec 7 2021, 10:26 AM

martinvonz updated this revision to Diff 31357.Dec 7 2021, 12:02 PM

martinvonz added a commit: rHG38941a28406a: mergestate: merge `preresolve()` into `resolve()`.Dec 8 2021, 3:17 AM

Closed by commit rHG38941a28406a: mergestate: merge `preresolve()` into `resolve()` (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (44 lines)
M			mercurial/merge.py (14 lines)
M			mercurial/mergestate.py (13 lines)
M			tests/test-copy-move-merge.t (4 lines)
M			tests/test-double-merge.t (4 lines)
M			tests/test-graft.t (7 lines)
M			tests/test-issue672.t (4 lines)
M			tests/test-merge-commit.t (4 lines)
M			tests/test-merge-criss-cross.t (3 lines)
M			tests/test-merge-force.t (36 lines)
M			tests/test-merge-halt.t (15 lines)
M			tests/test-merge-types.t (24 lines)
M			tests/test-merge7.t (3 lines)
M			tests/test-merge9.t (4 lines)
M			tests/test-rename-merge1.t (4 lines)
M			tests/test-rename-merge2.t (137 lines)
M			tests/test-resolve.t (16 lines)
M			tests/test-shelve.t (2 lines)
M			tests/test-sparse-profiles.t (4 lines)
M			tests/test-status-color.t (2 lines)
M			tests/test-subrepo.t (7 lines)
M			tests/test-up-local-change.t (9 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31307		Dec 4 2021, 2:06 AM	★	★
Diff 2	31357		Dec 7 2021, 12:02 PM	★	★
Diff 3	31380	rHG38941a28406a50b326d83ed8d6979b953589eacf	Dec 3 2021, 1:59 AM	★	★

Status	Author	Revision
Closed	martinvonz	D11863 filemerge: remove `premerge` argument from `_makebackup()`
Closed	martinvonz	D11860 filemerge: inline `_filemerge()` into `filemerge()`
Closed	martinvonz	D11859 filemerge: make `_filemerge()` do both premerge and merge
Closed	martinvonz	D11858 filemerge: merge `premerge()` into `filemerge()`
Closed	martinvonz	D11857 mergestate: inline `_resolve()` into `resolve()`
Closed	martinvonz	D11856 mergestate: make `_resolve()` do both preresolve and resolve
Closed	martinvonz	D11855 mergestate: merge `preresolve()` into `resolve()`
Closed	martinvonz	D11854 tests: remove unnecessary explicit args from `failfilemerge.py`
Closed	martinvonz	D11853 simplemerge: set `conflicts` earlier for :union tool

Diff 31380

mercurial/commands.py

This file is larger than 256 KB, so syntax highlighting is disabled by default.

	_(b'resolve command not applicable when not merging')			_(b'resolve command not applicable when not merging')
	)			)

	wctx = repo[None]			wctx = repo[None]
	m = scmutil.match(wctx, pats, opts)			m = scmutil.match(wctx, pats, opts)
	ret = 0			ret = 0
	didwork = False			didwork = False

	tocomplete = []
	hasconflictmarkers = []			hasconflictmarkers = []
	if mark:			if mark:
	markcheck = ui.config(b'commands', b'resolve.mark-check')			markcheck = ui.config(b'commands', b'resolve.mark-check')
	if markcheck not in [b'warn', b'abort']:			if markcheck not in [b'warn', b'abort']:
	# Treat all invalid / unrecognized values as 'none'.			# Treat all invalid / unrecognized values as 'none'.
	markcheck = False			markcheck = False
	for f in ms:			for f in ms:
	if not m(f):			if not m(f):
	except (IOError, OSError) as inst:			except (IOError, OSError) as inst:
	if inst.errno != errno.ENOENT:			if inst.errno != errno.ENOENT:
	raise			raise

	try:			try:
	# preresolve file			# preresolve file
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'resolve'):			with ui.configoverride(overrides, b'resolve'):
	complete, r = ms.preresolve(f, wctx)			r = ms.resolve(f, wctx)
	if not complete:			if r:
	tocomplete.append(f)
	elif r:
	ret = 1			ret = 1
	finally:			finally:
	ms.commit()			ms.commit()

	# replace filemerge's .orig file with our resolve file, but only			# replace filemerge's .orig file with our resolve file
	# for merges that are complete
	if complete:
	try:			try:
	util.rename(			util.rename(
	a + b".resolve", scmutil.backuppath(ui, repo, f)			a + b".resolve", scmutil.backuppath(ui, repo, f)
	)			)
	except OSError as inst:			except OSError as inst:
	if inst.errno != errno.ENOENT:			if inst.errno != errno.ENOENT:
	raise			raise

	if hasconflictmarkers:			if hasconflictmarkers:
	ui.warn(			ui.warn(
	_(			_(
	b'warning: the following files still have conflict '			b'warning: the following files still have conflict '
	b'markers:\n'			b'markers:\n'
	)			)
	+ b''.join(			+ b''.join(
	b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers			b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
	)			)
	)			)
	if markcheck == b'abort' and not all and not pats:			if markcheck == b'abort' and not all and not pats:
	raise error.StateError(			raise error.StateError(
	_(b'conflict markers detected'),			_(b'conflict markers detected'),
	hint=_(b'use --all to mark anyway'),			hint=_(b'use --all to mark anyway'),
	)			)

	for f in tocomplete:
	try:
	# resolve file
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'resolve'):
	r = ms.resolve(f, wctx)
	if r:
	ret = 1
	finally:
	ms.commit()

	# replace filemerge's .orig file with our resolve file
	a = repo.wjoin(f)
	try:
	util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
	except OSError as inst:
	if inst.errno != errno.ENOENT:
	raise

	ms.commit()			ms.commit()
	branchmerge = repo.dirstate.p2() != repo.nullid			branchmerge = repo.dirstate.p2() != repo.nullid
	# resolve is not doing a parent change here, however, `record updates`			# resolve is not doing a parent change here, however, `record updates`
	# will call some dirstate API that at intended for parent changes call.			# will call some dirstate API that at intended for parent changes call.
	# Ideally we would not need this and could implement a lighter version			# Ideally we would not need this and could implement a lighter version
	# of the recordupdateslogic that will not have to deal with the part			# of the recordupdateslogic that will not have to deal with the part
	# related to parent changes. However this would requires that:			# related to parent changes. However this would requires that:
	# - we are sure we passed around enough information at update/merge			# - we are sure we passed around enough information at update/merge

mercurial/merge.py

	mergestatemod.ACTION_GET,			mergestatemod.ACTION_GET,
	mergestatemod.ACTION_EXEC,			mergestatemod.ACTION_EXEC,
	mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,			mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
	mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,			mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
	)			)
	)			)

	try:			try:
	# premerge
	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\n" % (f, msg))
	ms.addcommitinfo(f, {b'merged': b'yes'})			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)
	if not complete:
	numupdates += 1
	tocomplete.append((f, args, msg))

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

	except error.InterventionRequired:			except error.InterventionRequired:
	# If the user has merge.on-failure=halt, catch the error and close the			# If the user has merge.on-failure=halt, catch the error and close the
	# merge state "properly".			# merge state "properly".
	pass			pass
	finally:			finally:
	ms.commit()			ms.commit()

mercurial/mergestate.py

	action = ACTION_ADD_MODIFIED			action = ACTION_ADD_MODIFIED
	else:			else:
	action = ACTION_ADD			action = ACTION_ADD
	# else: regular merges (no action necessary)			# else: regular merges (no action necessary)
	self._results[dfile] = merge_ret, action			self._results[dfile] = merge_ret, action

	return complete, merge_ret			return complete, merge_ret

	def preresolve(self, dfile, wctx):
	"""run premerge process for dfile

	Returns whether the merge is complete, and the exit code."""
	return self._resolve(True, dfile, wctx)

	def resolve(self, dfile, wctx):			def resolve(self, dfile, wctx):
	"""run merge process (assuming premerge was run) for dfile			"""run merge process for dfile

	Returns the exit code of the merge."""			Returns the exit code of the merge."""
	return self._resolve(False, dfile, wctx)[1]			complete, r = self._resolve(True, dfile, wctx)
				if not complete:
				r = self._resolve(False, dfile, wctx)[1]
				return r

	def counts(self):			def counts(self):
	"""return counts for updated, merged and removed files in this			"""return counts for updated, merged and removed files in this
	session"""			session"""
	updated, merged, removed = 0, 0, 0			updated, merged, removed = 0, 0, 0
	for r, action in pycompat.itervalues(self._results):			for r, action in pycompat.itervalues(self._results):
	if r is None:			if r is None:
	updated += 1			updated += 1

tests/test-copy-move-merge.t

	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6			ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving a for resolve of b			preserving a for resolve of b
	preserving a for resolve of c			preserving a for resolve of c
	removing a			removing a
	b: remote moved from a -> m (premerge)			b: remote moved from a -> m
	picked tool ':merge' for b (binary False symlink False changedelete False)			picked tool ':merge' for b (binary False symlink False changedelete False)
	merging a and b to b			merging a and b to b
	my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc			my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
	premerge successful			premerge successful
	c: remote moved from a -> m (premerge)			c: remote moved from a -> m
	picked tool ':merge' for c (binary False symlink False changedelete False)			picked tool ':merge' for c (binary False symlink False changedelete False)
	merging a and c to c			merging a and c to c
	my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc			my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
	premerge successful			premerge successful
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)

	file b			file b

tests/test-double-merge.t

	src: 'foo' -> dst: 'bar' *			src: 'foo' -> dst: 'bar' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104			ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving foo for resolve of bar			preserving foo for resolve of bar
	preserving foo for resolve of foo			preserving foo for resolve of foo
	bar: remote copied from foo -> m (premerge)			bar: remote copied from foo -> m
	picked tool ':merge' for bar (binary False symlink False changedelete False)			picked tool ':merge' for bar (binary False symlink False changedelete False)
	merging foo and bar to bar			merging foo and bar to bar
	my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc			my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
	premerge successful			premerge successful
	foo: versions differ -> m (premerge)			foo: versions differ -> m
	picked tool ':merge' for foo (binary False symlink False changedelete False)			picked tool ':merge' for foo (binary False symlink False changedelete False)
	merging foo			merging foo
	my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc			my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
	premerge successful			premerge successful
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)

	contents of foo			contents of foo

tests/test-graft.t

	on local side:			on local side:
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: True, partial: False			branchmerge: True, force: True, partial: False
	ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6			ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	b: local copied/moved from a -> m (premerge)			b: local copied/moved from a -> m
	picked tool ':merge' for b (binary False symlink False changedelete False)			picked tool ':merge' for b (binary False symlink False changedelete False)
	merging b and a to b			merging b and a to b
	my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622			my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
	premerge successful			premerge successful
	committing files:			committing files:
	b			b
	committing manifest			committing manifest
	committing changelog			committing changelog
	scanning for duplicate grafts			scanning for duplicate grafts
	grafting 4:9c233e8e184d "4"			grafting 4:9c233e8e184d "4"
	resolving manifests			resolving manifests
	branchmerge: True, force: True, partial: False			branchmerge: True, force: True, partial: False
	ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d			ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
	d: remote is newer -> g			d: remote is newer -> g
	getting d			getting d
	preserving e for resolve of e			preserving e for resolve of e
	e: versions differ -> m (premerge)			e: versions differ -> m
	picked tool ':merge' for e (binary False symlink False changedelete False)			picked tool ':merge' for e (binary False symlink False changedelete False)
	merging e			merging e
	my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304			my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
	e: versions differ -> m (merge)
	picked tool ':merge' for e (binary False symlink False changedelete False)			picked tool ':merge' for e (binary False symlink False changedelete False)
	my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304			my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')			warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
	abort: unresolved conflicts, can't continue			abort: unresolved conflicts, can't continue
	(use 'hg resolve' and 'hg graft --continue')			(use 'hg resolve' and 'hg graft --continue')
	[1]			[1]

	Summary should mention graft:			Summary should mention graft:
	$ echo base > d			$ echo base > d
	$ hg ci -m _			$ hg ci -m _
	$ hg graft -r 6			$ hg graft -r 6
	skipping ungraftable merge revision 6			skipping ungraftable merge revision 6
	[255]			[255]
	$ hg graft -r 6 --base 5			$ hg graft -r 6 --base 5
	grafting 6:25a2b029d3ae "6"			grafting 6:25a2b029d3ae "6"
	merging d			merging d
	merging e
	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')			warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
				merging e
	abort: unresolved conflicts, can't continue			abort: unresolved conflicts, can't continue
	(use 'hg resolve' and 'hg graft --continue')			(use 'hg resolve' and 'hg graft --continue')
	[1]			[1]
	$ echo a > d && hg resolve -qm			$ echo a > d && hg resolve -qm
	continue: hg graft --continue			continue: hg graft --continue
	$ hg graft --continue			$ hg graft --continue
	grafting 6:25a2b029d3ae "6"			grafting 6:25a2b029d3ae "6"

tests/test-issue672.t

	on local side:			on local side:
	src: '1' -> dst: '1a' *			src: '1' -> dst: '1a' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96			ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving 1a for resolve of 1a			preserving 1a for resolve of 1a
	1a: local copied/moved from 1 -> m (premerge)			1a: local copied/moved from 1 -> m
	picked tool ':merge' for 1a (binary False symlink False changedelete False)			picked tool ':merge' for 1a (binary False symlink False changedelete False)
	merging 1a and 1 to 1a			merging 1a and 1 to 1a
	my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9			my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
	premerge successful			premerge successful
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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 co -C 4			$ hg co -C 4
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved

	$ hg merge -y --debug 3			$ hg merge -y --debug 3
	unmatched files in other:			unmatched files in other:
	1a			1a
	all copies found (* = to merge, ! = divergent, % = renamed and deleted):			all copies found (* = to merge, ! = divergent, % = renamed and deleted):
	on remote side:			on remote side:
	src: '1' -> dst: '1a' *			src: '1' -> dst: '1a' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b			ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving 1 for resolve of 1a			preserving 1 for resolve of 1a
	removing 1			removing 1
	1a: remote moved from 1 -> m (premerge)			1a: remote moved from 1 -> m
	picked tool ':merge' for 1a (binary False symlink False changedelete False)			picked tool ':merge' for 1a (binary False symlink False changedelete False)
	merging 1 and 1a to 1a			merging 1 and 1a to 1a
	my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9			my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
	premerge successful			premerge successful
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)

tests/test-merge-commit.t

	This should use bar@rev2 as the ancestor:			This should use bar@rev2 as the ancestor:

	$ hg --debug merge 3			$ hg --debug merge 3
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28			ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving bar for resolve of bar			preserving bar for resolve of bar
	bar: versions differ -> m (premerge)			bar: versions differ -> m
	picked tool ':merge' for bar (binary False symlink False changedelete False)			picked tool ':merge' for bar (binary False symlink False changedelete False)
	merging bar			merging bar
	my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9			my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
	premerge successful			premerge successful
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)

	$ cat bar			$ cat bar
	This should use bar@rev2 as the ancestor:			This should use bar@rev2 as the ancestor:

	$ hg --debug merge 3			$ hg --debug merge 3
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0			ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving bar for resolve of bar			preserving bar for resolve of bar
	bar: versions differ -> m (premerge)			bar: versions differ -> m
	picked tool ':merge' for bar (binary False symlink False changedelete False)			picked tool ':merge' for bar (binary False symlink False changedelete False)
	merging bar			merging bar
	my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9			my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
	premerge successful			premerge successful
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)

	$ cat bar			$ cat bar

tests/test-merge-criss-cross.t

	note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922			note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922
	alternatively, use --config merge.preferancestor=40663881a6dd			alternatively, use --config merge.preferancestor=40663881a6dd
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922			ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
	f1: remote is newer -> g			f1: remote is newer -> g
	getting f1			getting f1
	preserving f2 for resolve of f2			preserving f2 for resolve of f2
	f2: versions differ -> m (premerge)			f2: versions differ -> m
	picked tool ':dump' for f2 (binary False symlink False changedelete False)			picked tool ':dump' for f2 (binary False symlink False changedelete False)
	merging f2			merging f2
	my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527			my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
	f2: versions differ -> m (merge)
	picked tool ':dump' for f2 (binary False symlink False changedelete False)			picked tool ':dump' for f2 (binary False symlink False changedelete False)
	my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527			my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
	1 files updated, 0 files merged, 0 files removed, 1 files unresolved			1 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ f --dump *			$ f --dump *
	f1:			f1:

tests/test-merge-force.t

	What do you want to do? u			What do you want to do? u
	file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content1_content4-tracked			merging content1_content2_content1_content4-tracked
				warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
	merging content1_content2_content2_content1-tracked			merging content1_content2_content2_content1-tracked
	merging content1_content2_content2_content4-tracked			merging content1_content2_content2_content4-tracked
				warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
	merging content1_content2_content3_content1-tracked			merging content1_content2_content3_content1-tracked
	merging content1_content2_content3_content3-tracked			merging content1_content2_content3_content3-tracked
				warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
	merging content1_content2_content3_content4-tracked			merging content1_content2_content3_content4-tracked
				warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
	merging content1_content2_missing_content1-tracked			merging content1_content2_missing_content1-tracked
	merging content1_content2_missing_content4-tracked			merging content1_content2_missing_content4-tracked
	merging missing_content2_content2_content4-tracked
	merging missing_content2_content3_content3-tracked
	merging missing_content2_content3_content4-tracked
	merging missing_content2_missing_content4-tracked
	merging missing_content2_missing_content4-untracked
	warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_content2_content4-tracked
	warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_content3_content3-tracked
	warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_content3_content4-tracked
	warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_missing_content4-tracked
	warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_missing_content4-untracked
	warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
	18 files updated, 3 files merged, 8 files removed, 35 files unresolved			18 files updated, 3 files merged, 8 files removed, 35 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

	Check which files need to be resolved (should correspond to the output above).			Check which files need to be resolved (should correspond to the output above).
	This should be the files for which the base (1st filename segment), the remote			This should be the files for which the base (1st filename segment), the remote
	(2nd segment) and the working copy (4th segment) are all different.			(2nd segment) and the working copy (4th segment) are all different.

	$ hg resolve --all --tool internal:merge3			$ hg resolve --all --tool internal:merge3
	file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content1_content4-tracked			merging content1_content2_content1_content4-tracked
				warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
	file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content2_content1-tracked			merging content1_content2_content2_content1-tracked
	file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content2_content4-tracked			merging content1_content2_content2_content4-tracked
				warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
	file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content3_content1-tracked			merging content1_content2_content3_content1-tracked
	file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content3_content3-tracked			merging content1_content2_content3_content3-tracked
				warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
	file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_content3_content4-tracked			merging content1_content2_content3_content4-tracked
				warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
	file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_missing_content1-tracked			merging content1_content2_missing_content1-tracked
	file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging content1_content2_missing_content4-tracked			merging content1_content2_missing_content4-tracked
				warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
	file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].			file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].			file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
	You can use (c)hanged version, (d)elete, or leave (u)nresolved.			You can use (c)hanged version, (d)elete, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].			file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
	You can use (c)hanged version, (d)elete, or leave (u)nresolved.			You can use (c)hanged version, (d)elete, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].			file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
	You can use (c)hanged version, (d)elete, or leave (u)nresolved.			You can use (c)hanged version, (d)elete, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].			file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
	You can use (c)hanged version, (d)elete, or leave (u)nresolved.			You can use (c)hanged version, (d)elete, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	merging missing_content2_content2_content4-tracked			merging missing_content2_content2_content4-tracked
	merging missing_content2_content3_content3-tracked
	merging missing_content2_content3_content4-tracked
	merging missing_content2_missing_content4-tracked
	merging missing_content2_missing_content4-untracked
	warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_content3_content3-tracked
	warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_content3_content4-tracked
	warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_missing_content4-tracked
	warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
				merging missing_content2_missing_content4-untracked
	warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')			warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
	[1]			[1]
	$ checkstatus > $TESTTMP/status2 2>&1			$ checkstatus > $TESTTMP/status2 2>&1
	$ cmp $TESTTMP/status1 $TESTTMP/status2 \|\| diff -U8 $TESTTMP/status1 $TESTTMP/status2			$ cmp $TESTTMP/status1 $TESTTMP/status2 \|\| diff -U8 $TESTTMP/status1 $TESTTMP/status2

	Set up working directory again			Set up working directory again

	$ hg -q update --clean 2			$ hg -q update --clean 2

tests/test-merge-halt.t

	$ echo d >> b			$ echo d >> b
	$ hg commit -qAm d			$ hg commit -qAm d

	Testing on-failure=continue			Testing on-failure=continue
	$ echo on-failure=continue >> $HGRCPATH			$ echo on-failure=continue >> $HGRCPATH
	$ hg rebase -s 1 -d 2 --tool false			$ hg rebase -s 1 -d 2 --tool false
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	merging a failed!			merging a failed!
				merging b
	merging b failed!			merging b failed!
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Testing on-failure=halt			Testing on-failure=halt
	$ echo on-failure=halt >> $HGRCPATH			$ echo on-failure=halt >> $HGRCPATH
	$ hg rebase -s 1 -d 2 --tool false			$ hg rebase -s 1 -d 2 --tool false
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	merging a failed!			merging a failed!
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Testing on-failure=prompt			Testing on-failure=prompt
	$ cat <<EOS >> $HGRCPATH			$ cat <<EOS >> $HGRCPATH
	> [merge]			> [merge]
	> on-failure=prompt			> on-failure=prompt
	> [ui]			> [ui]
	> interactive=1			> interactive=1
	> EOS			> EOS
	$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false			$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false
	> y			> y
	> n			> n
	> EOS			> EOS
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	merging a failed!			merging a failed!
	continue merge operation (yn)? y			continue merge operation (yn)? y
				merging b
	merging b failed!			merging b failed!
	continue merge operation (yn)? n			continue merge operation (yn)? n
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Check that successful tool with failed post-check halts the merge			Check that successful tool with failed post-check halts the merge
	$ cat <<EOS >> $HGRCPATH			$ cat <<EOS >> $HGRCPATH
	> [merge-tools]			> [merge-tools]
	> true.check=changed			> true.check=changed
	> EOS			> EOS
	$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true			$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true
	> y			> y
	> n			> n
	> n			> n
	> EOS			> EOS
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	output file a appears unchanged			output file a appears unchanged
	was merge successful (yn)? y			was merge successful (yn)? y
				merging b
	output file b appears unchanged			output file b appears unchanged
	was merge successful (yn)? n			was merge successful (yn)? n
	merging b failed!			merging b failed!
	continue merge operation (yn)? n			continue merge operation (yn)? n
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	> true.check=conflicts			> true.check=conflicts
	> true.premerge=keep			> true.premerge=keep
	> [merge]			> [merge]
	> on-failure=halt			> on-failure=halt
	> EOS			> EOS
	$ hg rebase -s 1 -d 2 --tool true			$ hg rebase -s 1 -d 2 --tool true
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	merging a failed!			merging a failed!
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Check that always-prompt also can halt the merge			Check that always-prompt also can halt the merge
	$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt			$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
	> y			> y
	> n			> n
	> EOS			> EOS
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	was merge of 'a' successful (yn)? y			was merge of 'a' successful (yn)? y
				merging b
	was merge of 'b' successful (yn)? n			was merge of 'b' successful (yn)? n
	merging b failed!			merging b failed!
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	$ hg resolve --list			$ hg resolve --list
	R a			R a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Check that successful tool otherwise allows the merge to continue			Check that successful tool otherwise allows the merge to continue
	$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep			$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b
	$TESTTMP/repo/a a~base a~other (glob)			$TESTTMP/repo/a a~base a~other (glob)
				merging b
	$TESTTMP/repo/b b~base b~other (glob)			$TESTTMP/repo/b b~base b~other (glob)

	Check that unshelve isn't broken by halting the merge			Check that unshelve isn't broken by halting the merge
	$ cat <<EOS >> $HGRCPATH			$ cat <<EOS >> $HGRCPATH
	> [extensions]			> [extensions]
	> shelve =			> shelve =
	> [merge-tools]			> [merge-tools]
	> false.check=conflicts			> false.check=conflicts
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo baz >> shelve_file1			$ echo baz >> shelve_file1
	$ echo baz >> shelve_file2			$ echo baz >> shelve_file2
	$ hg ci -m baz			$ hg ci -m baz
	$ hg unshelve --tool false --config merge-tools.false.premerge=keep			$ hg unshelve --tool false --config merge-tools.false.premerge=keep
	unshelving change 'default'			unshelving change 'default'
	rebasing shelved changes			rebasing shelved changes
	merging shelve_file1			merging shelve_file1
	merging shelve_file2
	merging shelve_file1 failed!			merging shelve_file1 failed!
	unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')			unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
	[240]			[240]
	$ hg status --config commands.status.verbose=True			$ hg status --config commands.status.verbose=True
	M shelve_file1			M shelve_file1
	M shelve_file2			M shelve_file2
	? shelve_file1.orig			? shelve_file1.orig
	? shelve_file2.orig
	# The repository is in an unfinished unshelve state.			# The repository is in an unfinished unshelve state.

	# Unresolved merge conflicts:			# Unresolved merge conflicts:
	#			#
	# shelve_file1			# shelve_file1
	# shelve_file2			# shelve_file2
	#			#
	# To mark files as resolved: hg resolve --mark FILE			# To mark files as resolved: hg resolve --mark FILE

	# To continue: hg unshelve --continue			# To continue: hg unshelve --continue
	# To abort: hg unshelve --abort			# To abort: hg unshelve --abort

	$ hg resolve --tool false --all --re-merge			$ hg resolve --tool false --all --re-merge
	merging shelve_file1			merging shelve_file1
	merging shelve_file2
	merging shelve_file1 failed!			merging shelve_file1 failed!
	merge halted after failed merge (see hg resolve)			merge halted after failed merge (see hg resolve)
	[240]			[240]
	$ hg shelve --list			$ hg shelve --list
	default (* ago) changes to: foo (glob)			default (* ago) changes to: foo (glob)
	$ hg unshelve --abort			$ hg unshelve --abort
	unshelve of 'default' aborted			unshelve of 'default' aborted

tests/test-merge-types.t


	Symlink is local parent, executable is other:			Symlink is local parent, executable is other:

	$ hg merge --debug			$ hg merge --debug
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c			ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	tool internal:merge (for pattern a) can't handle symlinks			tool internal:merge (for pattern a) can't handle symlinks
	couldn't find merge tool hgmerge			couldn't find merge tool hgmerge
	no tool found to merge a			no tool found to merge a
	picked tool ':prompt' for a (binary False symlink True changedelete False)			picked tool ':prompt' for a (binary False symlink True changedelete False)
	file 'a' needs to be resolved.			file 'a' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	$ hg update -C 1			$ hg update -C 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

	$ hg merge --debug --tool :union			$ hg merge --debug --tool :union
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f			ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool ':union' for a (binary False symlink True changedelete False)			picked tool ':union' for a (binary False symlink True changedelete False)
	merging a			merging a
	my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da			my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
	warning: internal :union cannot merge symlinks for a			warning: internal :union cannot merge symlinks for a
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ tellmeabout a			$ tellmeabout a
	a is an executable file with content:			a is an executable file with content:
	a			a

	$ hg update -C 1			$ hg update -C 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

	$ hg merge --debug --tool :merge3			$ hg merge --debug --tool :merge3
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f			ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool ':merge3' for a (binary False symlink True changedelete False)			picked tool ':merge3' for a (binary False symlink True changedelete False)
	merging a			merging a
	my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da			my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
	warning: internal :merge3 cannot merge symlinks for a			warning: internal :merge3 cannot merge symlinks for a
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ tellmeabout a			$ tellmeabout a
	a is an executable file with content:			a is an executable file with content:
	a			a

	$ hg update -C 1			$ hg update -C 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

	$ hg merge --debug --tool :merge-local			$ hg merge --debug --tool :merge-local
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f			ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool ':merge-local' for a (binary False symlink True changedelete False)			picked tool ':merge-local' for a (binary False symlink True changedelete False)
	merging a			merging a
	my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da			my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
	warning: internal :merge-local cannot merge symlinks for a			warning: internal :merge-local cannot merge symlinks for a
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ tellmeabout a			$ tellmeabout a
	a is an executable file with content:			a is an executable file with content:
	a			a

	$ hg update -C 1			$ hg update -C 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

	$ hg merge --debug --tool :merge-other			$ hg merge --debug --tool :merge-other
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f			ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool ':merge-other' for a (binary False symlink True changedelete False)			picked tool ':merge-other' for a (binary False symlink True changedelete False)
	merging a			merging a
	my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da			my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
	warning: internal :merge-other cannot merge symlinks for a			warning: internal :merge-other cannot merge symlinks for a
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]


	$ hg up -Cq 0			$ hg up -Cq 0
	$ echo data > a			$ echo data > a
	$ HGMERGE= hg up -y --debug --config ui.merge=			$ HGMERGE= hg up -y --debug --config ui.merge=
	resolving manifests			resolving manifests
	branchmerge: False, force: False, partial: False			branchmerge: False, force: False, partial: False
	ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f			ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	(couldn't find merge tool hgmerge\|tool hgmerge can't handle symlinks) (re)			(couldn't find merge tool hgmerge\|tool hgmerge can't handle symlinks) (re)
	no tool found to merge a			no tool found to merge a
	picked tool ':prompt' for a (binary False symlink True changedelete False)			picked tool ':prompt' for a (binary False symlink True changedelete False)
	file 'a' needs to be resolved.			file 'a' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges			use 'hg resolve' to retry unresolved file merges
	$ ln -s x e			$ ln -s x e
	$ ln -s 2 f			$ ln -s 2 f
	$ ln -s x g			$ ln -s x g
	$ ln -s 2 h			$ ln -s 2 h
	$ hg ci -Aqm2			$ hg ci -Aqm2

	$ hg merge			$ hg merge
	merging a			merging a
				warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	warning: cannot merge flags for b without common ancestor - keeping local flags			warning: cannot merge flags for b without common ancestor - keeping local flags
	merging b			merging b
				warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	merging bx			merging bx
				warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
	warning: cannot merge flags for c without common ancestor - keeping local flags			warning: cannot merge flags for c without common ancestor - keeping local flags
	tool internal:merge (for pattern d) can't handle symlinks			tool internal:merge (for pattern d) can't handle symlinks
	no tool found to merge d			no tool found to merge d
	file 'd' needs to be resolved.			file 'd' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	tool internal:merge (for pattern f) can't handle symlinks			tool internal:merge (for pattern f) can't handle symlinks
	no tool found to merge f			no tool found to merge f
	file 'f' needs to be resolved.			file 'f' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	tool internal:merge (for pattern h) can't handle symlinks			tool internal:merge (for pattern h) can't handle symlinks
	no tool found to merge h			no tool found to merge h
	file 'h' needs to be resolved.			file 'h' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
	3 files updated, 0 files merged, 0 files removed, 6 files unresolved			3 files updated, 0 files merged, 0 files removed, 6 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve -l			$ hg resolve -l
	U a			U a
	U b			U b
	U bx			U bx
	U d			U d
	g -> x			g -> x
	$ tellmeabout h			$ tellmeabout h
	h is a symlink:			h is a symlink:
	h -> 2			h -> 2

	$ hg up -Cqr1			$ hg up -Cqr1
	$ hg merge			$ hg merge
	merging a			merging a
				warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	warning: cannot merge flags for b without common ancestor - keeping local flags			warning: cannot merge flags for b without common ancestor - keeping local flags
	merging b			merging b
				warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	merging bx			merging bx
				warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
	warning: cannot merge flags for c without common ancestor - keeping local flags			warning: cannot merge flags for c without common ancestor - keeping local flags
	tool internal:merge (for pattern d) can't handle symlinks			tool internal:merge (for pattern d) can't handle symlinks
	no tool found to merge d			no tool found to merge d
	file 'd' needs to be resolved.			file 'd' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	tool internal:merge (for pattern f) can't handle symlinks			tool internal:merge (for pattern f) can't handle symlinks
	no tool found to merge f			no tool found to merge f
	file 'f' needs to be resolved.			file 'f' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	tool internal:merge (for pattern h) can't handle symlinks			tool internal:merge (for pattern h) can't handle symlinks
	no tool found to merge h			no tool found to merge h
	file 'h' needs to be resolved.			file 'h' needs to be resolved.
	You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.			You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
	3 files updated, 0 files merged, 0 files removed, 6 files unresolved			3 files updated, 0 files merged, 0 files removed, 6 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ tellmeabout a			$ tellmeabout a
	a is a plain file with content:			a is a plain file with content:
	<<<<<<< working copy: 2e60aa20b912 - test: 1			<<<<<<< working copy: 2e60aa20b912 - test: 1
	1			1
	=======			=======

tests/test-merge7.t

	new changesets 40d11a4173a8			new changesets 40d11a4173a8
	(run 'hg heads' to see heads, 'hg merge' to merge)			(run 'hg heads' to see heads, 'hg merge' to merge)
	$ hg merge --debug			$ hg merge --debug
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8			ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving test.txt for resolve of test.txt			preserving test.txt for resolve of test.txt
	test.txt: versions differ -> m (premerge)			test.txt: versions differ -> m
	picked tool ':merge' for test.txt (binary False symlink False changedelete False)			picked tool ':merge' for test.txt (binary False symlink False changedelete False)
	merging test.txt			merging test.txt
	my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118			my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
	test.txt: versions differ -> m (merge)
	picked tool ':merge' for test.txt (binary False symlink False changedelete False)			picked tool ':merge' for test.txt (binary False symlink False changedelete False)
	my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118			my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
	warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')			warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ cat test.txt			$ cat test.txt

tests/test-merge9.t

	$ echo quux > quux2			$ echo quux > quux2
	$ hg ci -Am 'change foo'			$ hg ci -Am 'change foo'
	adding quux2			adding quux2
	created new head			created new head

	test with the rename on the remote side			test with the rename on the remote side
	$ HGMERGE=false hg merge			$ HGMERGE=false hg merge
	merging bar			merging bar
	merging foo and baz to baz
	merging bar failed!			merging bar failed!
				merging foo and baz to baz
	1 files updated, 1 files merged, 0 files removed, 1 files unresolved			1 files updated, 1 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve -l			$ hg resolve -l
	U bar			U bar
	R baz			R baz

	test with the rename on the local side			test with the rename on the local side
	$ hg up -C 1			$ hg up -C 1
	3 files updated, 0 files merged, 1 files removed, 0 files unresolved			3 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ HGMERGE=false hg merge			$ HGMERGE=false hg merge
	merging bar			merging bar
	merging baz and foo to baz
	merging bar failed!			merging bar failed!
				merging baz and foo to baz
	1 files updated, 1 files merged, 0 files removed, 1 files unresolved			1 files updated, 1 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	show unresolved			show unresolved
	$ hg resolve -l			$ hg resolve -l
	U bar			U bar
	R baz			R baz

tests/test-rename-merge1.t

	ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c			ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
	note: possible conflict - a2 was renamed multiple times to:			note: possible conflict - a2 was renamed multiple times to:
	b2			b2
	c2			c2
	b2: remote created -> g			b2: remote created -> g
	getting b2			getting b2
	preserving a for resolve of b			preserving a for resolve of b
	removing a			removing a
	b: remote moved from a -> m (premerge)			b: remote moved from a -> m
	picked tool ':merge' for b (binary False symlink False changedelete False)			picked tool ':merge' for b (binary False symlink False changedelete False)
	merging a and b to b			merging a and b to b
	my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c			my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
	premerge successful			premerge successful
	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 status -AC			$ hg status -AC
	on remote side:			on remote side:
	src: 'x' -> dst: 'z' *			src: 'x' -> dst: 'z' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508			ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving z for resolve of z			preserving z for resolve of z
	z: both renamed from y -> m (premerge)			z: both renamed from y -> m
	picked tool ':merge3' for z (binary False symlink False changedelete False)			picked tool ':merge3' for z (binary False symlink False changedelete False)
	merging z			merging z
	my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e			my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
	premerge successful			premerge successful
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)
	$ ls			$ ls
	x			x
	z			z
	$ cat x			$ cat x
	x			x
	foo			foo
	# 'z' should have had the added 'foo' line			# 'z' should have had the added 'foo' line
	$ cat z			$ cat z
	x			x

tests/test-rename-merge2.t

	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24			ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving a for resolve of b			preserving a for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: remote copied from a -> m (premerge)			b: remote copied from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging a and b to b			merging a and b to b
	my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337			my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71			ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
	a: remote is newer -> g			a: remote is newer -> g
	getting a			getting a
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: local copied/moved from a -> m (premerge)			b: local copied/moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b and a to b			merging b and a to b
	my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337			my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 2 files merged, 0 files removed, 0 files unresolved			1 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M a			M a
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a			ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving a for resolve of b			preserving a for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	removing a			removing a
	b: remote moved from a -> m (premerge)			b: remote moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging a and b to b			merging a and b to b
	my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337			my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71			ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: local copied/moved from a -> m (premerge)			b: local copied/moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b and a to b			merging b and a to b
	my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337			my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337			my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337			my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	src: 'a' -> dst: 'b'			src: 'a' -> dst: 'b'
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24			ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
	b: remote created -> g			b: remote created -> g
	getting b			getting b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	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)
	--------------			--------------
	M b			M b
	on local side:			on local side:
	src: 'a' -> dst: 'b'			src: 'a' -> dst: 'b'
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336			ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving rev for resolve of rev			preserving rev for resolve of rev
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)
	--------------			--------------
	C a			C a
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a			ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
	a: other deleted -> r			a: other deleted -> r
	removing a			removing a
	b: remote created -> g			b: remote created -> g
	getting b			getting b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 1 files merged, 1 files removed, 0 files unresolved			1 files updated, 1 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	on local side:			on local side:
	src: 'a' -> dst: 'b'			src: 'a' -> dst: 'b'
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336			ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving rev for resolve of rev			preserving rev for resolve of rev
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337			my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337			my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 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)
	--------------			--------------
	C b			C b
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493			ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337			my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
	b: both renamed from a -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337			my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337			my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e			ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
	note: possible conflict - a was renamed multiple times to:			note: possible conflict - a was renamed multiple times to:
	b			b
	c			c
	c: remote created -> g			c: remote created -> g
	getting c			getting c
	preserving rev for resolve of rev			preserving rev for resolve of rev
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337			my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337			my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	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)
	--------------			--------------
	M c			M c
	src: 'a' -> dst: 'b'			src: 'a' -> dst: 'b'
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7			ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both created -> m (premerge)			b: both created -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000			my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
	b: both created -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000			my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a			ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
	a: other deleted -> r			a: other deleted -> r
	removing a			removing a
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both created -> m (premerge)			b: both created -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000			my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	b: both created -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000			my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 1 files removed, 0 files unresolved			0 files updated, 2 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a			ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
	a: remote is newer -> g			a: remote is newer -> g
	getting a			getting a
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337			my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 2 files merged, 0 files removed, 0 files unresolved			1 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M a			M a
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a			ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
	a: other deleted -> r			a: other deleted -> r
	removing a			removing a
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both created -> m (premerge)			b: both created -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000			my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	b: both created -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000			my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 1 files removed, 0 files unresolved			0 files updated, 2 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a			ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
	a: remote is newer -> g			a: remote is newer -> g
	getting a			getting a
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337			my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 2 files merged, 0 files removed, 0 files unresolved			1 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M a			M a
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24			ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337			my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337			my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a			ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337			my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337			my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a			ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: both renamed from a -> m (premerge)			b: both renamed from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b			merging b
	my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337			my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337			my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493			ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving a for resolve of b			preserving a for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	removing a			removing a
	b: remote moved from a -> m (premerge)			b: remote moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging a and b to b			merging a and b to b
	my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337			my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
	b: remote moved from a -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337			my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337			my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	src: 'a' -> dst: 'b' *			src: 'a' -> dst: 'b' *
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71			ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: local copied/moved from a -> m (premerge)			b: local copied/moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b and a to b			merging b and a to b
	my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337			my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
	rev: versions differ -> m (premerge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev
	my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
	b: local copied/moved from a -> m (merge)
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337			my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/b * * (glob)
	merge tool returned: 0			merge tool returned: 0
	rev: versions differ -> m (merge)			rev: versions differ -> m
				picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
				merging rev
				my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337			my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 2 files merged, 0 files removed, 0 files unresolved			0 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b
	checking for directory renames			checking for directory renames
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f			ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
	c: remote created -> g			c: remote created -> g
	getting c			getting c
	preserving b for resolve of b			preserving b for resolve of b
	preserving rev for resolve of rev			preserving rev for resolve of rev
	b: local copied/moved from a -> m (premerge)			b: local copied/moved from a -> m
	picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
	merging b and a to b			merging b and a to b
	my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337			my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
	premerge successful			premerge successful
	rev: versions differ -> m (premerge)			rev: versions differ -> m
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	merging rev			merging rev
	my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337			my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
	rev: versions differ -> m (merge)
	picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)			picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
	my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337			my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
	launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)			launching merge tool: * ../merge $TESTTMP/t/t/rev * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 2 files merged, 0 files removed, 0 files unresolved			1 files updated, 2 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	--------------			--------------
	M b			M b

tests/test-resolve.t

	$ hg resolve			$ hg resolve
	abort: no files or directories specified			abort: no files or directories specified
	(use --all to re-merge all unresolved files)			(use --all to re-merge all unresolved files)
	[10]			[10]

	resolve --all should re-merge all unresolved files			resolve --all should re-merge all unresolved files
	$ hg resolve --all			$ hg resolve --all
	merging file1			merging file1
	merging file2
	warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
				merging file2
	warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
	[1]			[1]
	$ cat file1.orig			$ cat file1.orig
	foo			foo
	baz			baz
	$ cat file2.orig			$ cat file2.orig
	foo			foo
	baz			baz

	.orig files should exists where specified			.orig files should exists where specified
	$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'			$ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
	merging file1			merging file1
	creating directory: $TESTTMP/repo/.hg/origbackups			creating directory: $TESTTMP/repo/.hg/origbackups
	merging file2
	warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
				merging file2
	warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
	[1]			[1]
	$ ls .hg/origbackups			$ ls .hg/origbackups
	file1			file1
	file2			file2
	$ grep '<<<' file1 > /dev/null			$ grep '<<<' file1 > /dev/null
	$ grep '<<<' file2 > /dev/null			$ grep '<<<' file2 > /dev/null

	\|			\|
	\| o 1 f30f98a8181f added emp1 emp2 emp3			\| o 1 f30f98a8181f added emp1 emp2 emp3
	\|/			\|/
	o 0 88660038d466 add boss			o 0 88660038d466 add boss

	$ hg rebase -s 1 -d 2			$ hg rebase -s 1 -d 2
	rebasing 1:f30f98a8181f "added emp1 emp2 emp3"			rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
	merging emp1			merging emp1
	merging emp2
	merging emp3
	warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
				merging emp2
	warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
				merging emp3
	warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]

	Test when commands.resolve.confirm config option is not set:			Test when commands.resolve.confirm config option is not set:
	===========================================================			===========================================================
	$ hg resolve --all			$ hg resolve --all
	merging emp1			merging emp1
	merging emp2
	merging emp3
	warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
				merging emp2
	warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
				merging emp3
	warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
	[1]			[1]

	Test when config option is set:			Test when config option is set:
	==============================			==============================
	$ cat >> .hg/hgrc << EOF			$ cat >> .hg/hgrc << EOF
	> [ui]			> [ui]
	> interactive = True			> interactive = True
	abort: user quit			abort: user quit
	[250]			[250]

	$ hg resolve --all << EOF			$ hg resolve --all << EOF
	> y			> y
	> EOF			> EOF
	re-merge all unresolved files (yn)? y			re-merge all unresolved files (yn)? y
	merging emp1			merging emp1
	merging emp2
	merging emp3
	warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
				merging emp2
	warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
				merging emp3
	warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
	[1]			[1]

	Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):			Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):
	===============================================================================================			===============================================================================================

	$ hg resolve -m emp1			$ hg resolve -m emp1
	$ hg resolve -l			$ hg resolve -l

tests/test-shelve.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
	$ echo C >> bar1			$ echo C >> bar1
	$ echo C >> bar2			$ echo C >> bar2
	$ hg ci -m 'add C to bars'			$ hg ci -m 'add C to bars'
	$ hg unshelve -i			$ hg unshelve -i
	unshelving change 'default-01'			unshelving change 'default-01'
	rebasing shelved changes			rebasing shelved changes
	merging bar1			merging bar1
	merging bar2
	warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
				merging bar2
	warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')			unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
	[240]			[240]

	$ cat > bar1 <<EOF			$ cat > bar1 <<EOF
	> A			> A
	> B			> B
	> C			> C

tests/test-sparse-profiles.t

	index.html			index.html
	webpage.sparse			webpage.sparse

	Verify conflicting merge pulls in the conflicting changes			Verify conflicting merge pulls in the conflicting changes

	$ hg merge 1			$ hg merge 1
	temporarily included 2 file(s) in the sparse checkout for merging			temporarily included 2 file(s) in the sparse checkout for merging
	merging backend.sparse			merging backend.sparse
	merging data.py
	warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')			warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
				merging data.py
	warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')			warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 2 files unresolved			0 files updated, 0 files merged, 0 files removed, 2 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ rm *.orig			$ rm *.orig
	$ ls -A			$ ls -A
	.hg			.hg
	data.py			data.py
	readme.txt			readme.txt
	webpage.sparse			webpage.sparse

	$ hg rebase -d 2			$ hg rebase -d 2
	rebasing 1:a2b1de640a62 "edit profile"			rebasing 1:a2b1de640a62 "edit profile"
	temporarily included 2 file(s) in the sparse checkout for merging			temporarily included 2 file(s) in the sparse checkout for merging
	merging backend.sparse			merging backend.sparse
	merging data.py
	warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')			warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
				merging data.py
	warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')			warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')			unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
	[240]			[240]
	$ rm *.orig			$ rm *.orig
	$ ls -A			$ ls -A
	.hg			.hg
	backend.sparse			backend.sparse
	data.py			data.py

tests/test-status-color.t

	$ hg update 0			$ hg update 0
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo "file a change 2" > a			$ echo "file a change 2" > a
	$ echo "file b change 2" > b			$ echo "file b change 2" > b
	$ hg commit -m "head 2"			$ hg commit -m "head 2"
	created new head			created new head
	$ hg merge			$ hg merge
	merging a			merging a
	merging b
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
				merging b
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 2 files unresolved			0 files updated, 0 files merged, 0 files removed, 2 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve -m b			$ hg resolve -m b

	hg resolve with one unresolved, one resolved:			hg resolve with one unresolved, one resolved:

tests/test-subrepo.t

	revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382			revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
	$ hg ci -m9			$ hg ci -m9
	created new head			created new head
	$ hg merge 6 --debug # test change			$ hg merge 6 --debug # test change
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4			ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	.hgsubstate: versions differ -> m (premerge)			.hgsubstate: versions differ -> m
	subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec			subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
	subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg			subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
	getting subrepo t			getting subrepo t
	resolving manifests			resolving manifests
	branchmerge: False, force: False, partial: False			branchmerge: False, force: False, partial: False
	ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a			ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a
	t: remote is newer -> g			t: remote is newer -> g
	getting t			getting t
	$ echo conflict > t/t			$ echo conflict > t/t
	$ hg ci -m10			$ hg ci -m10
	committing subrepository t			committing subrepository t
	$ HGMERGE=internal:merge hg merge --debug 7 # test conflict			$ HGMERGE=internal:merge hg merge --debug 7 # test conflict
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf			ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	.hgsubstate: versions differ -> m (premerge)			.hgsubstate: versions differ -> m
	subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4			subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
	subrepo t: both sides changed			subrepo t: both sides changed
	subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)			subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev].			you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev].
	what do you want to do? m			what do you want to do? m
	merging subrepository "t"			merging subrepository "t"
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198			ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving t for resolve of t			preserving t for resolve of t
	t: versions differ -> m (premerge)			t: versions differ -> m
	picked tool ':merge' for t (binary False symlink False changedelete False)			picked tool ':merge' for t (binary False symlink False changedelete False)
	merging t			merging t
	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a			my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
	t: versions differ -> m (merge)
	picked tool ':merge' for t (binary False symlink False changedelete False)			picked tool ':merge' for t (binary False symlink False changedelete False)
	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a			my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
	warning: conflicts while merging t! (edit, then use 'hg resolve --mark')			warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg			subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 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)

tests/test-up-local-change.t


	$ hg --debug up			$ hg --debug up
	resolving manifests			resolving manifests
	branchmerge: False, force: False, partial: False			branchmerge: False, force: False, partial: False
	ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb			ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
	b: remote created -> g			b: remote created -> g
	getting b			getting b
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	merging a			merging a
	my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a			my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
	a: versions differ -> m (merge)
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a			my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
	launching merge tool: true $TESTTMP/r2/a * * (glob)			launching merge tool: true $TESTTMP/r2/a * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 1 files merged, 0 files removed, 0 files unresolved			1 files updated, 1 files merged, 0 files removed, 0 files unresolved
	$ hg parents			$ hg parents
	changeset: 1:1e71731e6fbb			changeset: 1:1e71731e6fbb
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: 2			summary: 2

	$ hg --debug up 0			$ hg --debug up 0
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	resolving manifests			resolving manifests
	branchmerge: False, force: False, partial: False			branchmerge: False, force: False, partial: False
	ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a			ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
	b: other deleted -> r			b: other deleted -> r
	removing b			removing b
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	merging a			merging a
	my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb			my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
	a: versions differ -> m (merge)
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb			my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
	launching merge tool: true $TESTTMP/r2/a * * (glob)			launching merge tool: true $TESTTMP/r2/a * * (glob)
	merge tool returned: 0			merge tool returned: 0
	0 files updated, 1 files merged, 1 files removed, 0 files unresolved			0 files updated, 1 files merged, 1 files removed, 0 files unresolved
	$ hg parents			$ hg parents
	changeset: 0:c19d34741b0a			changeset: 0:c19d34741b0a
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: 1			summary: 1

	$ hg --debug up			$ hg --debug up
	resolving manifests			resolving manifests
	branchmerge: False, force: False, partial: False			branchmerge: False, force: False, partial: False
	ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb			ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
	b: remote created -> g			b: remote created -> g
	getting b			getting b
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	merging a			merging a
	my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a			my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
	a: versions differ -> m (merge)
	picked tool 'true' for a (binary False symlink False changedelete False)			picked tool 'true' for a (binary False symlink False changedelete False)
	my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a			my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
	launching merge tool: true $TESTTMP/r2/a * * (glob)			launching merge tool: true $TESTTMP/r2/a * * (glob)
	merge tool returned: 0			merge tool returned: 0
	1 files updated, 1 files merged, 0 files removed, 0 files unresolved			1 files updated, 1 files merged, 0 files removed, 0 files unresolved
	$ hg parents			$ hg parents
	changeset: 1:1e71731e6fbb			changeset: 1:1e71731e6fbb
	tag: tip			tag: tip