This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1829

merge: add `--abort` flag which can abort the merge
ClosedPublic

Authored by pulkit on Jan 8 2018, 9:49 AM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG41ef02ba329b: merge: add `--abort` flag which can abort the merge

Summary

Currently we don't have a good functionality to abort the merge and tell user to
do hg update -C . which can leads to different results if user missed the '.'
and moreover does not align with other abort functionalities like rebase, shelve
etc.

This patch adds hg merge --abort which will abort the ongoing merge and take
us back to the chagneset where we started from. Works in both cases when merge
resulted in conflicts and when there were no conflicts.

.. feature::

A `--abort` flag to merge command to abort the ongoing merge.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

Event Timeline

pulkit created this revision.Jan 8 2018, 9:49 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 8 2018, 9:49 AM

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

I'm fine with this.

yuja added a subscriber: yuja.Jan 18 2018, 7:50 AM

yuja added inline comments.

mercurial/commands.py
3559	Dropped `.` in flight.
mercurial/hg.py
861	It seems `ms.localctx` is the public interface. Can you send a followup?

Closed by commit rHG41ef02ba329b: merge: add `--abort` flag which can abort the merge (authored by pulkit). · Explain WhyJan 18 2018, 8:01 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (19 lines)
M			mercurial/hg.py (31 lines)
M			tests/test-add.t (2 lines)
M			tests/test-commit-unresolved.t (78 lines)
M			tests/test-completion.t (2 lines)
M			tests/test-conflict.t (10 lines)
M			tests/test-convert-svn-sink.t (2 lines)
M			tests/test-fileset.t (2 lines)
M			tests/test-keyword.t (2 lines)
M			tests/test-largefiles-update.t (2 lines)
M			tests/test-lfconvert.t (2 lines)
M			tests/test-log.t (4 lines)
M			tests/test-merge-changedelete.t (16 lines)
M			tests/test-merge-criss-cross.t (4 lines)
M			tests/test-merge-force.t (2 lines)
M			tests/test-merge-internal-tools-pattern.t (2 lines)
M			tests/test-merge-remove.t (2 lines)
M			tests/test-merge-tools.t (48 lines)
M			tests/test-merge-types.t (22 lines)
M			tests/test-merge7.t (4 lines)
M			tests/test-merge9.t (4 lines)
M			tests/test-mq-qnew.t (4 lines)
M			tests/test-pathconflicts-basic.t (2 lines)
M			tests/test-pathconflicts-merge.t (8 lines)
M			tests/test-rename-dir-merge.t (4 lines)
M			tests/test-rename-merge2.t (4 lines)
M			tests/test-resolve.t (4 lines)
M			tests/test-sparse-profiles.t (2 lines)
M			tests/test-sparse.t (2 lines)
M			tests/test-status-color.t (2 lines)
M			tests/test-subrepo.t (2 lines)
M			tests/test-tag.t (2 lines)

Diff 4872

mercurial/commands.py

	fm.write('path', '%s\n', f)			fm.write('path', '%s\n', f)
	fm.end()			fm.end()

	@command('^merge',			@command('^merge',
	[('f', 'force', None,			[('f', 'force', None,
	_('force a merge including outstanding changes (DEPRECATED)')),			_('force a merge including outstanding changes (DEPRECATED)')),
	('r', 'rev', '', _('revision to merge'), _('REV')),			('r', 'rev', '', _('revision to merge'), _('REV')),
	('P', 'preview', None,			('P', 'preview', None,
	_('review revisions to merge (no merge is performed)'))			_('review revisions to merge (no merge is performed)')),
				('', 'abort', None, _('abort the ongoing merge')),
	] + mergetoolopts,			] + mergetoolopts,
	_('[-P] [[-r] REV]'))			_('[-P] [[-r] REV]'))
	def merge(ui, repo, node=None, **opts):			def merge(ui, repo, node=None, **opts):
	"""merge another revision into working directory			"""merge another revision into working directory

	The current working directory is updated with all changes made in			The current working directory is updated with all changes made in
	the requested revision since the last common predecessor revision.			the requested revision since the last common predecessor revision.

	Files that changed between either parent are marked as changed for			Files that changed between either parent are marked as changed for
	the next commit and a commit must be performed before any further			the next commit and a commit must be performed before any further
	updates to the repository are allowed. The next commit will have			updates to the repository are allowed. The next commit will have
	two parents.			two parents.

	``--tool`` can be used to specify the merge tool used for file			``--tool`` can be used to specify the merge tool used for file
	merges. It overrides the HGMERGE environment variable and your			merges. It overrides the HGMERGE environment variable and your
	configuration files. See :hg:`help merge-tools` for options.			configuration files. See :hg:`help merge-tools` for options.

	If no revision is specified, the working directory's parent is a			If no revision is specified, the working directory's parent is a
	head revision, and the current branch contains exactly one other			head revision, and the current branch contains exactly one other
	head, the other head is merged with by default. Otherwise, an			head, the other head is merged with by default. Otherwise, an
	explicit revision with which to merge with must be provided.			explicit revision with which to merge with must be provided.

	See :hg:`help resolve` for information on handling file conflicts.			See :hg:`help resolve` for information on handling file conflicts.

	To undo an uncommitted merge, use :hg:`update --clean .` which			To undo an uncommitted merge, use :hg:`merge --abort` which
				yujaUnsubmitted Not Done Dropped `.` in flight. yuja: Dropped ` .` in flight.
	will check out a clean copy of the original merge parent, losing			will check out a clean copy of the original merge parent, losing
	all changes.			all changes.

	Returns 0 on success, 1 if there are unresolved files.			Returns 0 on success, 1 if there are unresolved files.
	"""			"""

	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
				abort = opts.get('abort')
				if abort and repo.dirstate.p2() == nullid:
				cmdutil.wrongtooltocontinue(repo, _('merge'))
				if abort:
				if node:
				raise error.Abort(_("cannot specify a node with --abort"))
				if opts.get('rev'):
				raise error.Abort(_("cannot specify both --rev and --abort"))
				if opts.get('preview'):
				raise error.Abort(_("cannot specify --preview with --abort"))
	if opts.get('rev') and node:			if opts.get('rev') and node:
	raise error.Abort(_("please specify just one revision"))			raise error.Abort(_("please specify just one revision"))
	if not node:			if not node:
	node = opts.get('rev')			node = opts.get('rev')

	if node:			if node:
	node = scmutil.revsingle(repo, node).node()			node = scmutil.revsingle(repo, node).node()

	if not node:			if not node and not abort:
	node = repo[destutil.destmerge(repo)].node()			node = repo[destutil.destmerge(repo)].node()

	if opts.get('preview'):			if opts.get('preview'):
	# find nodes that are ancestors of p2 but not of p1			# find nodes that are ancestors of p2 but not of p1
	p1 = repo.lookup('.')			p1 = repo.lookup('.')
	p2 = repo.lookup(node)			p2 = repo.lookup(node)
	nodes = repo.changelog.findmissing(common=[p1], heads=[p2])			nodes = repo.changelog.findmissing(common=[p1], heads=[p2])

	displayer = cmdutil.show_changeset(ui, repo, opts)			displayer = cmdutil.show_changeset(ui, repo, opts)
	for node in nodes:			for node in nodes:
	displayer.show(repo[node])			displayer.show(repo[node])
	displayer.close()			displayer.close()
	return 0			return 0

	try:			try:
	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')			repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
	force = opts.get('force')			force = opts.get('force')
	labels = ['working copy', 'merge rev']			labels = ['working copy', 'merge rev']
	return hg.merge(repo, node, force=force, mergeforce=force,			return hg.merge(repo, node, force=force, mergeforce=force,
	labels=labels)			labels=labels, abort=abort)
	finally:			finally:
	ui.setconfig('ui', 'forcemerge', '', 'merge')			ui.setconfig('ui', 'forcemerge', '', 'merge')

	@command('outgoing\|out',			@command('outgoing\|out',
	[('f', 'force', None, _('run even when the destination is unrelated')),			[('f', 'force', None, _('run even when the destination is unrelated')),
	('r', 'rev', [],			('r', 'rev', [],
	_('a changeset intended to be included in the destination'), _('REV')),			_('a changeset intended to be included in the destination'), _('REV')),
	('n', 'newest-first', None, _('show newest record first')),			('n', 'newest-first', None, _('show newest record first')),

mercurial/hg.py

	# hg.py - repository classes for mercurial			# hg.py - repository classes for mercurial
	#			#
	# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>			# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
	# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>			# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	import errno			import errno
	import hashlib			import hashlib
	import os			import os
	import shutil			import shutil

	from .i18n import _			from .i18n import _
	from .node import nullid			from .node import (
				hex,
				nullid,
				)

	from . import (			from . import (
	bookmarks,			bookmarks,
	bundlerepo,			bundlerepo,
	cmdutil,			cmdutil,
	destutil,			destutil,
	discovery,			discovery,
	error,			error,
	ui.status(_("(leaving bookmark %s)\n") % b)			ui.status(_("(leaving bookmark %s)\n") % b)
	bookmarks.deactivate(repo)			bookmarks.deactivate(repo)

	if warndest:			if warndest:
	destutil.statusotherdests(ui, repo)			destutil.statusotherdests(ui, repo)

	return ret			return ret

	def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None):			def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
				abort=False):
	"""Branch merge with node, resolving changes. Return true if any			"""Branch merge with node, resolving changes. Return true if any
	unresolved conflicts."""			unresolved conflicts."""
				if not abort:
	stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,			stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,
	labels=labels)			labels=labels)
				else:
				ms = mergemod.mergestate.read(repo)
				if ms.active():
				# there were conflicts
				node = hex(ms._local)
				yujaUnsubmitted Not Done It seems `ms.localctx` is the public interface. Can you send a followup? yuja: It seems `ms.localctx` is the public interface. Can you send a followup?
				else:
				# there were no conficts, mergestate was not stored
				node = repo['.'].hex()

				repo.ui.status(_("aborting the merge, updating back to"
				" %s\n") % node[:12])
				stats = mergemod.update(repo, node, branchmerge=False, force=True,
				labels=labels)

	_showstats(repo, stats)			_showstats(repo, stats)
	if stats[3]:			if stats[3]:
	repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "			repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
	"or 'hg update -C .' to abandon\n"))			"or 'hg merge --abort' to abandon\n"))
	elif remind:			elif remind and not abort:
	repo.ui.status(_("(branch merge, don't forget to commit)\n"))			repo.ui.status(_("(branch merge, don't forget to commit)\n"))
	return stats[3] > 0			return stats[3] > 0

	def _incoming(displaychlist, subreporecurse, ui, repo, source,			def _incoming(displaychlist, subreporecurse, ui, repo, source,
	opts, buffered=False):			opts, buffered=False):
	"""			"""
	Helper for incoming / gincoming.			Helper for incoming / gincoming.
	displaychlist gets called with			displaychlist gets called with

tests/test-add.t

	$ echo aaa > a			$ echo aaa > a
	$ hg ci -m 2			$ hg ci -m 2
	created new head			created new head

	$ hg merge			$ hg merge
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg st			$ hg st
	M a			M a
	? a.orig			? a.orig

	wdir doesn't cause a crash, and can be dynamically selected if dirty			wdir doesn't cause a crash, and can be dynamically selected if dirty

	$ hg log -r "heads(. or wdir() & file('**'))"			$ hg log -r "heads(. or wdir() & file('**'))"

tests/test-commit-unresolved.t

	$ commit "C" 2			$ commit "C" 2

	$ hg update -C 0			$ hg update -C 0
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo "D" >> A			$ echo "D" >> A
	$ commit "D" 3			$ commit "D" 3
	created new head			created new head

				State before the merge

				$ hg status
				$ hg id
				e45016d2b3d3 tip
				$ hg summary
				parent: 3:e45016d2b3d3 tip
				D
				branch: default
				commit: (clean)
				update: 2 new changesets, 2 branch heads (merge)
				phases: 4 draft

				Testing the abort functionality first in case of conflicts

				$ hg merge --abort
				abort: no merge in progress
				[255]
				$ hg merge
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				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
				[1]

				$ hg merge --abort e4501
				abort: cannot specify a node with --abort
				[255]
				$ hg merge --abort --rev e4501
				abort: cannot specify both --rev and --abort
				[255]

				$ hg merge --abort
				aborting the merge, updating back to e45016d2b3d3
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Checking that we got back in the same state

				$ hg status
				? A.orig
				$ hg id
				e45016d2b3d3 tip
				$ hg summary
				parent: 3:e45016d2b3d3 tip
				D
				branch: default
				commit: 1 unknown (clean)
				update: 2 new changesets, 2 branch heads (merge)
				phases: 4 draft

	Merging a conflict araises			Merging a conflict araises

	$ hg merge			$ hg merge
	merging A			merging A
	warning: conflicts while merging A! (edit, then use 'hg resolve --mark')			warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	Correct the conflict without marking the file as resolved			Correct the conflict without marking the file as resolved

	$ echo "ABCD" > A			$ echo "ABCD" > A
	$ hg commit -m "Merged"			$ hg commit -m "Merged"
	abort: unresolved merge conflicts (see 'hg help resolve')			abort: unresolved merge conflicts (see 'hg help resolve')
	[255]			[255]

	Mark the conflict as resolved and commit			Mark the conflict as resolved and commit

	$ hg resolve -m A			$ hg resolve -m A
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m "Merged"			$ hg commit -m "Merged"

	Test that if a file is removed but not marked resolved, the commit still fails			Test that if a file is removed but not marked resolved, the commit still fails
	(issue4972)			(issue4972)

	$ hg up ".^"			$ hg up ".^"
	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 2			$ hg merge 2
	merging A			merging A
	warning: conflicts while merging A! (edit, then use 'hg resolve --mark')			warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg rm --force A			$ hg rm --force A
	$ hg commit -m merged			$ hg commit -m merged
	abort: unresolved merge conflicts (see 'hg help resolve')			abort: unresolved merge conflicts (see 'hg help resolve')
	[255]			[255]

	$ hg resolve -ma			$ hg resolve -ma
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m merged			$ hg commit -m merged
	created new head			created new head

				Testing the abort functionality in case of no conflicts

				$ hg update -C 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ addcommit "E" 4
				created new head
				$ hg id
				68352a18a7c4 tip

				$ hg merge -r 4
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg merge --preview --abort
				abort: cannot specify --preview with --abort
				[255]

				$ hg merge --abort
				aborting the merge, updating back to 68352a18a7c4
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg id
				68352a18a7c4 tip

	$ cd ..			$ cd ..

tests/test-completion.t

	annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template			annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, skip, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, include, exclude, template
	clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure			clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
	commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos			commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos
	diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos			diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
	export: output, switch-parent, rev, text, git, binary, nodates			export: output, switch-parent, rev, text, git, binary, nodates
	forget: include, exclude			forget: include, exclude
	init: ssh, remotecmd, insecure			init: ssh, remotecmd, insecure
	log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude			log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
	merge: force, rev, preview, tool			merge: force, rev, preview, abort, tool
	pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure			pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
	push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure			push: force, rev, bookmark, branch, new-branch, pushvars, ssh, remotecmd, insecure
	remove: after, force, subrepos, include, exclude			remove: after, force, subrepos, include, exclude
	serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, subrepos			serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, subrepos
	status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template			status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
	summary: remote			summary: remote
	update: clean, check, merge, date, rev, tool			update: clean, check, merge, date, rev, tool
	addremove: similarity, subrepos, include, exclude, dry-run			addremove: similarity, subrepos, include, exclude, dry-run

tests/test-conflict.t

	> EOF			> EOF
	$ hg commit -m branch2			$ hg commit -m branch2
	created new head			created new head

	$ hg merge 1			$ hg merge 1
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ hg id			$ hg id
	618808747361+c0c68e4fe667+ tip			618808747361+c0c68e4fe667+ tip

	$ echo "[commands]" >> $HGRCPATH			$ echo "[commands]" >> $HGRCPATH
	$ echo "status.verbose=true" >> $HGRCPATH			$ echo "status.verbose=true" >> $HGRCPATH
	$ hg status			$ hg status
	> [ui]			> [ui]
	> mergemarkertemplate = '{author} {rev}'			> mergemarkertemplate = '{author} {rev}'
	> EOF			> EOF

	$ hg merge 1			$ hg merge 1
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	3			3
	<<<<<<< working copy: test 2			<<<<<<< working copy: test 2

	$ hg up -q --clean 2			$ hg up -q --clean 2
	$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc			$ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc

	$ hg merge 1			$ hg merge 1
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	3			3
	<<<<<<< working copy			<<<<<<< working copy
	6			6
	8			8
	=======			=======
	4			4
	5			5
	>>>>>>> merge rev			>>>>>>> merge rev
	Hop we are done.			Hop we are done.

	internal:merge3			internal:merge3

	$ hg up -q --clean .			$ hg up -q --clean .

	$ hg merge 1 --tool internal:merge3			$ hg merge 1 --tool internal:merge3
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	<<<<<<< working copy			<<<<<<< working copy
	1			1
	2			2
	3			3
	6			6
	$ hg ci -m "Add some stuff at the beginning"			$ hg ci -m "Add some stuff at the beginning"

	Now test :merge-other and :merge-local			Now test :merge-other and :merge-local

	$ hg merge			$ hg merge
	merging a			merging a
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve --tool :merge-other a			$ hg resolve --tool :merge-other a
	merging a			merging a
	(no more unresolved files)			(no more unresolved files)
	$ cat a			$ cat a
	Start of file			Start of file

tests/test-convert-svn-sink.t

	adding right-2			adding right-2

	$ hg --cwd b up -C 2			$ hg --cwd b up -C 2
	3 files updated, 0 files merged, 2 files removed, 0 files unresolved			3 files updated, 0 files merged, 2 files removed, 0 files unresolved
	$ hg --cwd b merge			$ hg --cwd b merge
	merging b			merging b
	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
	2 files updated, 0 files merged, 0 files removed, 1 files unresolved			2 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg --cwd b revert -r 2 b			$ hg --cwd b revert -r 2 b
	$ hg --cwd b resolve -m b			$ hg --cwd b resolve -m b
	(no more unresolved files)			(no more unresolved files)
	$ hg --cwd b ci -d '5 0' -m 'merge'			$ hg --cwd b ci -d '5 0' -m 'merge'

	Expect 4 changes			Expect 4 changes

tests/test-fileset.t

	$ hg ci -m diverging b2			$ hg ci -m diverging b2
	created new head			created new head
	$ fileset 'resolved()'			$ fileset 'resolved()'
	$ fileset 'unresolved()'			$ fileset 'unresolved()'
	$ hg merge			$ hg merge
	merging b2			merging b2
	warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
	* files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)			* files updated, 0 files merged, 1 files removed, 1 files unresolved (glob)
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ fileset 'resolved()'			$ fileset 'resolved()'
	$ fileset 'unresolved()'			$ fileset 'unresolved()'
	b2			b2
	$ echo e > b2			$ echo e > b2
	$ hg resolve -m b2			$ hg resolve -m b2
	(no more unresolved files)			(no more unresolved files)
	$ fileset 'resolved()'			$ fileset 'resolved()'

tests/test-keyword.t

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo bar >> m			$ echo bar >> m
	$ hg commit -m 8bar			$ hg commit -m 8bar
	created new head			created new head
	$ hg merge			$ hg merge
	merging m			merging m
	warning: conflicts while merging m! (edit, then use 'hg resolve --mark')			warning: conflicts while merging m! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat m			$ cat m
	$Id$			$Id$
	<<<<<<< working copy: 88a80c8d172e - test: 8bar			<<<<<<< working copy: 88a80c8d172e - test: 8bar
	bar			bar
	=======			=======
	foo			foo
	>>>>>>> merge rev: 85d2d2d732a5 - test: simplemerge			>>>>>>> merge rev: 85d2d2d732a5 - test: simplemerge

tests/test-largefiles-update.t

	ancestor was 4669e532d5b2c093a78eca010077e708a071bb64			ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
	keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or			keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
	take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o			take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
	merging normal1			merging normal1
	warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')			warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
	getting changed largefiles			getting changed largefiles
	1 largefiles updated, 0 removed			1 largefiles updated, 0 removed
	0 files updated, 1 files merged, 0 files removed, 1 files unresolved			0 files updated, 1 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg status -A large1			$ hg status -A large1
	M large1			M large1
	$ cat large1			$ cat large1
	large1 in #1			large1 in #1
	$ cat .hglf/large1			$ cat .hglf/large1
	58e24f733a964da346e2407a2bee99d9001184f5			58e24f733a964da346e2407a2bee99d9001184f5
	$ rm normal1.orig			$ rm normal1.orig

tests/test-lfconvert.t

	$ hg rm large normal3			$ hg rm large normal3
	$ hg commit -q -m"remove large, normal3"			$ hg commit -q -m"remove large, normal3"
	$ hg merge			$ hg merge
	merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat			merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
	merging sub/normal2 and stuff/normal2 to stuff/normal2			merging sub/normal2 and stuff/normal2 to stuff/normal2
	warning: stuff/maybelarge.dat looks like a binary file.			warning: stuff/maybelarge.dat looks like a binary file.
	warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')			warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
	0 files updated, 1 files merged, 0 files removed, 1 files unresolved			0 files updated, 1 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat			$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
	$ hg resolve -m stuff/maybelarge.dat			$ hg resolve -m stuff/maybelarge.dat
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m"merge"			$ hg commit -m"merge"
	$ hg log -G --template "{rev}:{node\|short} {desc\|firstline}\n"			$ hg log -G --template "{rev}:{node\|short} {desc\|firstline}\n"
	@ 5:4884f215abda merge			@ 5:4884f215abda merge
	\|\			\|\

tests/test-log.t

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo 'change foo in branch' > foo			$ echo 'change foo in branch' > foo
	$ hg ci -m "change foo in branch, related"			$ hg ci -m "change foo in branch, related"
	created new head			created new head
	$ hg merge 7			$ hg merge 7
	merging foo			merging foo
	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')			warning: conflicts while merging foo! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ echo 'merge 1' > foo			$ echo 'merge 1' > foo
	$ hg resolve -m foo			$ hg resolve -m foo
	(no more unresolved files)			(no more unresolved files)
	$ hg ci -m "First merge, related"			$ hg ci -m "First merge, related"

	$ hg merge 4			$ hg merge 4
	merging foo			merging foo
	warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')			warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ echo 'merge 2' > foo			$ echo 'merge 2' > foo
	$ hg resolve -m foo			$ hg resolve -m foo
	(no more unresolved files)			(no more unresolved files)
	$ hg ci -m "Last merge, related"			$ hg ci -m "Last merge, related"

	$ hg log --graph			$ hg log --graph
	@ changeset: 10:4dae8563d2c5			@ changeset: 10:4dae8563d2c5

tests/test-merge-changedelete.t

	$ hg merge -y			$ hg merge -y
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved? u			use (c)hanged version, (d)elete, or leave (u)nresolved? u
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
	merging file3			merging file3
	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 3 files unresolved			0 files updated, 0 files merged, 0 files removed, 3 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ status			$ status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	> EOF			> EOF
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved? c			use (c)hanged version, (d)elete, or leave (u)nresolved? c
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
	merging file3			merging file3
	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
	0 files updated, 2 files merged, 0 files removed, 1 files unresolved			0 files updated, 2 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ status			$ status
	--- status ---			--- status ---
	file2: * (glob)			file2: * (glob)
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz
	unrecognized response			unrecognized response
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
	merging file3			merging file3
	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
	0 files updated, 1 files merged, 1 files removed, 1 files unresolved			0 files updated, 1 files merged, 1 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ status			$ status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	R file1			R file1
	--- resolve --list ---			--- resolve --list ---
	> EOF			> EOF
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved? d			use (c)hanged version, (d)elete, or leave (u)nresolved? d
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?			use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
	merging file3			merging file3
	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 1 files removed, 2 files unresolved			0 files updated, 0 files merged, 1 files removed, 2 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ status			$ status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	R file1			R file1
	--- resolve --list ---			--- resolve --list ---

	$ hg co -C			$ hg co -C
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	updated to "13910f48cf7b: changed file1, removed file2, changed file3"			updated to "13910f48cf7b: changed file1, removed file2, changed file3"
	1 other heads for branch "default"			1 other heads for branch "default"

	$ hg merge --tool :fail			$ hg merge --tool :fail
	0 files updated, 0 files merged, 0 files removed, 3 files unresolved			0 files updated, 0 files merged, 0 files removed, 3 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ status 2>&1 \| tee $TESTTMP/fail.status			$ status 2>&1 \| tee $TESTTMP/fail.status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	U file1			U file1

	$ hg merge --config ui.interactive=True --tool :prompt			$ hg merge --config ui.interactive=True --tool :prompt
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved?			use (c)hanged version, (d)elete, or leave (u)nresolved?
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved?			use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?			keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
	0 files updated, 0 files merged, 0 files removed, 3 files unresolved			0 files updated, 0 files merged, 0 files removed, 3 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ status 2>&1 \| tee $TESTTMP/prompt.status			$ status 2>&1 \| tee $TESTTMP/prompt.status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	U file1			U file1

	$ hg merge --tool :prompt			$ hg merge --tool :prompt
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved? u			use (c)hanged version, (d)elete, or leave (u)nresolved? u
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u			keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u
	0 files updated, 0 files merged, 0 files removed, 3 files unresolved			0 files updated, 0 files merged, 0 files removed, 3 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ status			$ status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	U file1			U file1
	$ hg merge --tool :merge3			$ hg merge --tool :merge3
	local [working copy] changed file1 which other [merge rev] deleted			local [working copy] changed file1 which other [merge rev] deleted
	use (c)hanged version, (d)elete, or leave (u)nresolved? u			use (c)hanged version, (d)elete, or leave (u)nresolved? u
	other [merge rev] changed file2 which local [working copy] deleted			other [merge rev] changed file2 which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
	merging file3			merging file3
	warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 3 files unresolved			0 files updated, 0 files merged, 0 files removed, 3 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ status			$ status
	--- status ---			--- status ---
	M file2			M file2
	M file3			M file3
	C file1			C file1
	--- resolve --list ---			--- resolve --list ---
	U file1			U file1

tests/test-merge-criss-cross.t

	f2: versions differ -> m (premerge)			f2: versions differ -> m (premerge)
	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@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527			my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527
	f2: versions differ -> m (merge)			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@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527			my f2@6373bbfdae1d+ other f2@e673248094b1 ancestor f2@0f6b37dbe527
	3 files updated, 0 files merged, 0 files removed, 1 files unresolved			3 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ f --dump --recurse *			$ f --dump --recurse *
	d2: directory with 2 files			d2: directory with 2 files
	d2/f3:			d2/f3:
	>>>			>>>
	0 base			0 base
	<<<			<<<
	$ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d"			$ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d"
	note: using 0f6b37dbe527 as ancestor of 6373bbfdae1d and e673248094b1			note: using 0f6b37dbe527 as ancestor of 6373bbfdae1d and e673248094b1
	alternatively, use --config merge.preferancestor=d1d156401c1b			alternatively, use --config merge.preferancestor=d1d156401c1b
	resolving manifests			resolving manifests
	getting f1			getting f1
	getting d1/f3 to d2/f3			getting d1/f3 to d2/f3
	merging f2			merging f2
	3 files updated, 0 files merged, 0 files removed, 1 files unresolved			3 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	Redo merge with merge.preferancestor="*" to enable bid merge			Redo merge with merge.preferancestor="*" to enable bid merge

	$ rm f*			$ rm f*
	$ hg up -qC .			$ hg up -qC .
	$ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*"			$ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*"
	note: merging 6373bbfdae1d+ and e673248094b1 using bids from ancestors 0f6b37dbe527 and d1d156401c1b			note: merging 6373bbfdae1d+ and e673248094b1 using bids from ancestors 0f6b37dbe527 and d1d156401c1b

tests/test-merge-force.t

	warning: conflicts while merging content1_content2_content3_content4-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')
	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')
	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')
	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')
	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')
	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 update -C .' 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.

	Interestingly, one untracked file got merged and added, which corresponds to the			Interestingly, one untracked file got merged and added, which corresponds to the
	odd 'if force and branchmerge and different' case in manifestmerge().			odd 'if force and branchmerge and different' case in manifestmerge().

tests/test-merge-internal-tools-pattern.t


	Merge using internal:fail tool:			Merge using internal:fail tool:

	$ echo "[merge-patterns]" > .hg/hgrc			$ echo "[merge-patterns]" > .hg/hgrc
	$ echo "* = internal:fail" >> .hg/hgrc			$ echo "* = internal:fail" >> .hg/hgrc

	$ hg merge			$ hg merge
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ cat f			$ cat f
	line 1			line 1
	line 2			line 2
	third line			third line

	$ hg stat			$ hg stat

tests/test-merge-remove.t


	Those who use force will lose			Those who use force will lose

	$ hg merge -f			$ hg merge -f
	other [merge rev] changed bar which local [working copy] deleted			other [merge rev] changed bar which local [working copy] deleted
	use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u			use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
	merging foo1 and foo to foo1			merging foo1 and foo to foo1
	0 files updated, 1 files merged, 0 files removed, 1 files unresolved			0 files updated, 1 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat bar			$ cat bar
	bleh			bleh
	$ hg st			$ hg st
	M bar			M bar
	M foo1			M foo1

tests/test-merge-tools.t

	hg merge -r 2			hg merge -r 2
	override $PATH to ensure hgmerge not visible; use $PYTHON in case we're			override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
	running from a devel copy, not a temp installation			running from a devel copy, not a temp installation

	$ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2			$ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
	merging f			merging f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	<<<<<<< working copy: ef83787e2614 - test: revision 1			<<<<<<< working copy: ef83787e2614 - test: revision 1
	revision 1			revision 1
	=======			=======
	revision 2			revision 2
	>>>>>>> merge rev: 0185f4e0cf02 - test: revision 2			>>>>>>> merge rev: 0185f4e0cf02 - test: revision 2
	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2			$ hg merge -r 2
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	#if unix-permissions			#if unix-permissions

	unexecutable file in $PATH shouldn't be found:			unexecutable file in $PATH shouldn't be found:

	$ echo "echo fail" > false			$ echo "echo fail" > false
	$ hg up -qC 1			$ hg up -qC 1
	$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2			$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
	merging f			merging f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ rm false			$ rm false

	#endif			#endif

	executable directory in $PATH shouldn't be found:			executable directory in $PATH shouldn't be found:

	$ mkdir false			$ mkdir false
	$ hg up -qC 1			$ hg up -qC 1
	$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2			$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
	merging f			merging f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ rmdir false			$ rmdir false

	true with higher .priority gets precedence:			true with higher .priority gets precedence:

	$ echo "true.priority=1" >> .hg/hgrc			$ echo "true.priority=1" >> .hg/hgrc
	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-tools.true.priority=-7			$ hg merge -r 2 --config merge-tools.true.priority=-7
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	or false set higher on command line:			or false set higher on command line:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-tools.false.priority=117			$ hg merge -r 2 --config merge-tools.false.priority=117
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	or true set to disabled:			or true set to disabled:
	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-tools.true.disabled=yes			$ hg merge -r 2 --config merge-tools.true.disabled=yes
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	or true.executable not found in PATH:			or true.executable not found in PATH:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool			$ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	or true.executable with bogus path:			or true.executable with bogus path:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool			$ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-patterns.f=false			$ hg merge -r 2 --config merge-patterns.f=false
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool			$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
	couldn't find merge tool true (for pattern f)			couldn't find merge tool true (for pattern f)
	merging f			merging f
	couldn't find merge tool true (for pattern f)			couldn't find merge tool true (for pattern f)
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool			$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
	couldn't find merge tool true (for pattern f)			couldn't find merge tool true (for pattern f)
	merging f			merging f
	couldn't find merge tool true (for pattern f)			couldn't find merge tool true (for pattern f)
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=false			$ hg merge -r 2 --config ui.merge=false
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	ui.merge specifies internal:fail:			ui.merge specifies internal:fail:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:fail			$ hg merge -r 2 --config ui.merge=internal:fail
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:prompt			$ hg merge -r 2 --config ui.merge=internal:prompt
	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u			keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? 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 or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	U f			U f

	ui.merge specifies :prompt, with 'leave unresolved' chosen			ui.merge specifies :prompt, with 'leave unresolved' chosen

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF			$ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
	> u			> u
	> EOF			> EOF
	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u			keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? 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 or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	U f			U f

	prompt with EOF			prompt with EOF

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true			$ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
	keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f?			keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f?
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:dump			$ hg merge -r 2 --config ui.merge=internal:dump
	merging f			merging f
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.base			? f.base
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 3 --config ui.merge=internal:forcedump			$ hg merge -r 3 --config ui.merge=internal:forcedump
	merging f			merging f
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.base			? f.base
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false			$ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --config ui.merge=internal:other --tool=false			$ hg merge -r 2 --config ui.merge=internal:other --tool=false
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	HGMERGE specifies internal:other but is overruled by --tool=false			HGMERGE specifies internal:other but is overruled by --tool=false

	$ HGMERGE=internal:other ; export HGMERGE			$ HGMERGE=internal:other ; export HGMERGE
	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	false.whatever=			false.whatever=
	true.priority=1			true.priority=1
	true.executable=cat			true.executable=cat
	# hg update -C 1			# hg update -C 1
	$ hg merge -r 2 --tool=false			$ hg merge -r 2 --tool=false
	merging f			merging f
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	revision 0			revision 0
	space			space
	revision 2			revision 2
	space			space
	output file f appears unchanged			output file f appears unchanged
	was merge successful (yn)? n			was merge successful (yn)? n
	merging f failed!			merging f failed!
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	revision 1			revision 1
	space			space
	# hg stat			# hg stat
	M f			M f
	? f.orig			? f.orig
	# hg resolve --list			# hg resolve --list
	U f			U f

	#if symlink			#if symlink

	internal merge cannot handle symlinks and shouldn't try:			internal merge cannot handle symlinks and shouldn't try:

	$ hg update -q -C 1			$ hg update -q -C 1
	$ rm f			$ rm f
	$ ln -s symlink f			$ ln -s symlink f
	$ hg commit -qm 'f is symlink'			$ hg commit -qm 'f is symlink'
	$ hg merge -r 2 --tool internal:merge			$ hg merge -r 2 --tool internal:merge
	merging f			merging f
	warning: internal :merge cannot merge symlinks for f			warning: internal :merge cannot merge symlinks for f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	#endif			#endif

	Verify naming of temporary files and that extension is preserved:			Verify naming of temporary files and that extension is preserved:

	$ hg update -q -C 1			$ hg update -q -C 1
	$ hg mv f f.txt			$ hg mv f f.txt

tests/test-merge-types.t

	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m (premerge)
	picked tool ':merge' for a (binary False symlink True changedelete False)			picked tool ':merge' for a (binary False symlink True changedelete False)
	merging a			merging a
	my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da			my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
	warning: internal :merge cannot merge symlinks for a			warning: internal :merge 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 update -C .' 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 symlink:			a is a symlink:
	a -> symlink			a -> symlink
	$ hg resolve a --tool internal:other			$ hg resolve a --tool internal:other
	(no more unresolved files)			(no more unresolved files)
	$ tellmeabout a			$ tellmeabout a
	preserving a for resolve of a			preserving a for resolve of a
	a: versions differ -> m (premerge)			a: versions differ -> m (premerge)
	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 update -C .' 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
	searching for copies back to rev 1			searching for copies back to rev 1
	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 (premerge)
	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 update -C .' 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
	searching for copies back to rev 1			searching for copies back to rev 1
	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 (premerge)
	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 update -C .' 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
	searching for copies back to rev 1			searching for copies back to rev 1
	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 (premerge)
	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 update -C .' 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

	Update to link without local change should get us a symlink (issue3316):			Update to link without local change should get us a symlink (issue3316):

	$ rm f			$ rm f
	$ ln -s base f			$ ln -s base f
	$ hg ci -qm2			$ hg ci -qm2
	$ hg merge			$ hg merge
	merging f			merging f
	warning: internal :merge cannot merge symlinks for f			warning: internal :merge cannot merge symlinks for f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ tellmeabout f			$ tellmeabout f
	f is a symlink:			f is a symlink:
	f -> base			f -> base

	$ hg up -Cqr1			$ hg up -Cqr1
	$ hg merge			$ hg merge
	merging f			merging f
	warning: internal :merge cannot merge symlinks for f			warning: internal :merge cannot merge symlinks for f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ tellmeabout f			$ tellmeabout f
	f is a plain file with content:			f is a plain file with content:
	file			file
	content			content

	$ cd ..			$ cd ..

	$ rm f			$ rm f
	$ ln -s dangling f			$ ln -s dangling f
	$ hg ci -qm2			$ hg ci -qm2
	$ hg merge			$ hg merge
	merging f			merging f
	warning: internal :merge cannot merge symlinks for f			warning: internal :merge cannot merge symlinks for f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ tellmeabout f			$ tellmeabout f
	f is a symlink:			f is a symlink:
	f -> dangling			f -> dangling

	$ hg up -Cqr1			$ hg up -Cqr1
	$ hg merge			$ hg merge
	merging f			merging f
	warning: internal :merge cannot merge symlinks for f			warning: internal :merge cannot merge symlinks for f
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ tellmeabout f			$ tellmeabout f
	f is a plain file with content:			f is a plain file with content:
	f			f

	Test removed 'x' flag merged with content change - both ways			Test removed 'x' flag merged with content change - both ways

	$ hg up -Cqr0			$ hg up -Cqr0
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
	merging h			merging h
	warning: internal :merge cannot merge symlinks for h			warning: internal :merge cannot merge symlinks for h
	warning: conflicts while merging h! (edit, then use 'hg resolve --mark')			warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			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 b! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging bx! (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 update -C .' 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
	U f			U f
	U h			U h
	warning: conflicts while merging f! (edit, then use 'hg resolve --mark')			warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
	merging h			merging h
	warning: internal :merge cannot merge symlinks for h			warning: internal :merge cannot merge symlinks for h
	warning: conflicts while merging h! (edit, then use 'hg resolve --mark')			warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			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 b! (edit, then use 'hg resolve --mark')
	warning: conflicts while merging bx! (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 update -C .' 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
	=======			=======
	2			2
	>>>>>>> merge rev: 0c617753b41b - test: 2			>>>>>>> merge rev: 0c617753b41b - test: 2

tests/test-merge7.t

	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files (+1 heads)			added 1 changesets with 1 changes to 1 files (+1 heads)
	new changesets 96b70246a118			new changesets 96b70246a118
	(run 'hg heads' to see heads, 'hg merge' to merge)			(run 'hg heads' to see heads, 'hg merge' to merge)
	$ hg merge			$ hg merge
	merging test.txt			merging test.txt
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	resolve conflict			resolve conflict
	$ cat >test.txt <<"EOF"			$ cat >test.txt <<"EOF"
	> one			> one
	> two-point-five			> two-point-five
	> three			> three
	> EOF			> EOF
	$ rm -f *.orig			$ rm -f *.orig
	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)			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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ cat test.txt			$ cat test.txt
	one			one
	<<<<<<< working copy: 50c3a7e29886 - test: Merge 1			<<<<<<< working copy: 50c3a7e29886 - test: Merge 1
	two-point-five			two-point-five
	=======			=======
	two-point-one			two-point-one

tests/test-merge9.t

	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 foo and baz to baz
	merging bar failed!			merging bar failed!
	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 update -C .' 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 baz and foo to baz
	merging bar failed!			merging bar failed!
	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 update -C .' 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

	unmark baz			unmark baz

tests/test-mq-qnew.t


	% fail when trying to import a merge			% fail when trying to import a merge
	adding a			adding a
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	created new head			created new head
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	(no more unresolved files)			(no more unresolved files)
	abort: cannot manage merge changesets			abort: cannot manage merge changesets
	$ rm -r sandbox			$ rm -r sandbox

	hg headers			hg headers

	$ echo "plain=false" >> $HGRCPATH			$ echo "plain=false" >> $HGRCPATH
	$ mkdir sandbox			$ mkdir sandbox

	% fail when trying to import a merge			% fail when trying to import a merge
	adding a			adding a
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	created new head			created new head
	merging a			merging 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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	(no more unresolved files)			(no more unresolved files)
	abort: cannot manage merge changesets			abort: cannot manage merge changesets
	$ rm -r sandbox			$ rm -r sandbox

	Test saving last-message.txt			Test saving last-message.txt

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo

tests/test-pathconflicts-basic.t

	$ hg merge --verbose dir			$ hg merge --verbose dir
	resolving manifests			resolving manifests
	a: path conflict - a file or link has the same name as a directory			a: path conflict - a file or link has the same name as a directory
	the local file has been renamed to a~853701544ac3			the local file has been renamed to a~853701544ac3
	resolve manually then use 'hg resolve --mark a'			resolve manually then use 'hg resolve --mark a'
	moving a to a~853701544ac3			moving a to a~853701544ac3
	getting a/b			getting a/b
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg update --clean .			$ hg update --clean .
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ rm a~853701544ac3			$ rm a~853701544ac3

	Basic update - local directory conflicts with remote file			Basic update - local directory conflicts with remote file

	$ hg up -q 0			$ hg up -q 0

tests/test-pathconflicts-merge.t

	$ hg merge --verbose dir			$ hg merge --verbose dir
	resolving manifests			resolving manifests
	a/b: path conflict - a file or link has the same name as a directory			a/b: path conflict - a file or link has the same name as a directory
	the local file has been renamed to a/b~0ed027b96f31			the local file has been renamed to a/b~0ed027b96f31
	resolve manually then use 'hg resolve --mark a/b'			resolve manually then use 'hg resolve --mark a/b'
	moving a/b to a/b~0ed027b96f31			moving a/b to a/b~0ed027b96f31
	getting a/b/c/d			getting a/b/c/d
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg status			$ hg status
	M a/b/c/d			M a/b/c/d
	A a/b~0ed027b96f31			A a/b~0ed027b96f31
	R a/b			R a/b
	$ hg resolve --all			$ hg resolve --all
	a/b: path conflict must be resolved manually			a/b: path conflict must be resolved manually
	$ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31			$ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31
	$ hg resolve --mark a/b			$ hg resolve --mark a/b
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m "merge file and dir (deleted file)"			$ hg commit -m "merge file and dir (deleted file)"

	Merge - local symlink conflicts with remote directory			Merge - local symlink conflicts with remote directory

	$ hg up link			$ hg up link
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(activating bookmark link)			(activating bookmark link)
	$ hg bookmark -i			$ hg bookmark -i
	$ hg merge dir			$ hg merge dir
	a/b: path conflict - a file or link has the same name as a directory			a/b: path conflict - a file or link has the same name as a directory
	the local file has been renamed to a/b~2ea68033e3be			the local file has been renamed to a/b~2ea68033e3be
	resolve manually then use 'hg resolve --mark a/b'			resolve manually then use 'hg resolve --mark a/b'
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg status			$ hg status
	M a/b/c/d			M a/b/c/d
	A a/b~2ea68033e3be			A a/b~2ea68033e3be
	R a/b			R a/b
	$ hg resolve --list			$ hg resolve --list
	P a/b			P a/b
	$ hg resolve --all			$ hg resolve --all
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(activating bookmark dir)			(activating bookmark dir)
	$ hg bookmark -i			$ hg bookmark -i
	$ hg merge file			$ hg merge file
	a/b: path conflict - a file or link has the same name as a directory			a/b: path conflict - a file or link has the same name as a directory
	the remote file has been renamed to a/b~0ed027b96f31			the remote file has been renamed to a/b~0ed027b96f31
	resolve manually then use 'hg resolve --mark a/b'			resolve manually then use 'hg resolve --mark a/b'
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg status			$ hg status
	A a/b~0ed027b96f31			A a/b~0ed027b96f31
	$ hg resolve --all			$ hg resolve --all
	a/b: path conflict must be resolved manually			a/b: path conflict must be resolved manually
	$ hg mv a/b~0ed027b96f31 a/b/old-b			$ hg mv a/b~0ed027b96f31 a/b/old-b
	$ hg resolve --mark a/b			$ hg resolve --mark a/b
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m "merge dir and file (move file into dir)"			$ hg commit -m "merge dir and file (move file into dir)"
	created new head			created new head
	$ hg merge file2			$ hg merge file2
	merging a/b/old-b and a/b to a/b/old-b			merging a/b/old-b and a/b to a/b/old-b
	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 a/b/old-b			$ cat a/b/old-b
	2			2
	$ hg commit -m "merge file2 (copytrace tracked rename)"			$ hg commit -m "merge file2 (copytrace tracked rename)"
	$ hg merge link			$ hg merge link
	a/b: path conflict - a file or link has the same name as a directory			a/b: path conflict - a file or link has the same name as a directory
	the remote file has been renamed to a/b~2ea68033e3be			the remote file has been renamed to a/b~2ea68033e3be
	resolve manually then use 'hg resolve --mark a/b'			resolve manually then use 'hg resolve --mark a/b'
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg mv a/b~2ea68033e3be a/b.old			$ hg mv a/b~2ea68033e3be a/b.old
	$ readlink.py a/b.old			$ readlink.py a/b.old
	a/b.old -> c			a/b.old -> c
	$ hg resolve --mark a/b			$ hg resolve --mark a/b
	(no more unresolved files)			(no more unresolved files)
	$ hg commit -m "merge link (rename link)"			$ hg commit -m "merge link (rename link)"

tests/test-rename-dir-merge.t

	$ hg co -qC 1			$ hg co -qC 1
	$ echo target > b/c			$ echo target > b/c
	$ hg add b/c			$ hg add b/c
	$ hg commit -qm 'new file in target directory'			$ hg commit -qm 'new file in target directory'
	$ hg merge 2			$ hg merge 2
	merging b/c and a/c to b/c			merging b/c and a/c to b/c
	warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b/c! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg st -A			$ hg st -A
	M b/c			M b/c
	a/c			a/c
	? a/d			? a/d
	? b/c.orig			? b/c.orig
	C b/a			C b/a
	C b/b			C b/b
	? a/d			? a/d
	C a/a			C a/a
	C a/b			C a/b
	C a/c			C a/c
	$ hg merge 5			$ hg merge 5
	merging a/c and b/c to b/c			merging a/c and b/c to b/c
	warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')			warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')
	2 files updated, 0 files merged, 2 files removed, 1 files unresolved			2 files updated, 0 files merged, 2 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg st -A			$ hg st -A
	M b/a			M b/a
	M b/b			M b/b
	M b/c			M b/c
	a/c			a/c
	R a/a			R a/a
	R a/b			R a/b

tests/test-rename-merge2.t

	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 (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, 1 files unresolved			0 files updated, 2 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	--------------			--------------
	M a			M a
	M b			M b
	abort: unresolved merge conflicts (see 'hg help resolve')			abort: unresolved merge conflicts (see 'hg help resolve')
	--------------			--------------

	$ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"			$ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
	created new head			created new head
	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 (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, 1 files unresolved			0 files updated, 2 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	--------------			--------------
	M b			M b
	C a			C a
	abort: unresolved merge conflicts (see 'hg help resolve')			abort: unresolved merge conflicts (see 'hg help resolve')
	--------------			--------------

	$ tm "up a " "um a b" " " "20 merge a and b to b, remove a"			$ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
	created new head			created new head

tests/test-resolve.t

	adding file3			adding file3
	created new head			created new head

	failing merge			failing merge

	$ hg up -qC 2			$ hg up -qC 2
	$ hg merge --tool=internal:fail 1			$ hg merge --tool=internal:fail 1
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	resolve -l should contain unresolved entries			resolve -l should contain unresolved entries

	$ hg resolve -l			$ hg resolve -l
	U file1			U file1
	U file2			U file2

	$ hg resolve -m			$ hg resolve -m
	(no more unresolved files)			(no more unresolved files)

	get back to conflicting state			get back to conflicting state

	$ hg up -qC 2			$ hg up -qC 2
	$ hg merge --tool=internal:fail 1			$ hg merge --tool=internal:fail 1
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	resolve without arguments should suggest --all			resolve without arguments should suggest --all
	$ 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)
	[255]			[255]

tests/test-sparse-profiles.t


	$ hg merge 1			$ hg merge 1
	temporarily included 1 file(s) in the sparse checkout for merging			temporarily included 1 file(s) in the sparse checkout for merging
	merging backend.sparse			merging backend.sparse
	merging data.py			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')
	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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]

	$ rm *.orig			$ rm *.orig
	$ ls			$ ls
	backend.sparse			backend.sparse
	data.py			data.py
	index.html			index.html
	webpage.sparse			webpage.sparse

tests/test-sparse.t

	Verify merge fails if merging excluded files			Verify merge fails if merging excluded files

	$ hg up -q 1			$ hg up -q 1
	$ hg merge -r 2			$ hg merge -r 2
	temporarily included 1 file(s) in the sparse checkout for merging			temporarily included 1 file(s) in the sparse checkout for merging
	merging hide			merging hide
	warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')			warning: conflicts while merging hide! (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 update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg debugsparse			$ hg debugsparse
	[exclude]			[exclude]
	hide*			hide*

	Temporarily Included Files (for merge/rebase):			Temporarily Included Files (for merge/rebase):
	hide			hide

tests/test-status-color.t

	$ 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			merging b
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			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 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 update -C .' 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:

	$ hg resolve -l			$ hg resolve -l
	\x1b[0;31;1mU \x1b[0m\x1b[0;31;1ma\x1b[0m (esc)			\x1b[0;31;1mU \x1b[0m\x1b[0;31;1ma\x1b[0m (esc)
	\x1b[0;32;1mR \x1b[0m\x1b[0;32;1mb\x1b[0m (esc)			\x1b[0;32;1mR \x1b[0m\x1b[0;32;1mb\x1b[0m (esc)

tests/test-subrepo.t

	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)			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 update -C .' 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)

	should conflict			should conflict

	$ cat t/t			$ cat t/t
	<<<<<<< local: 20a0db6fbf6c - test: 10			<<<<<<< local: 20a0db6fbf6c - test: 10

tests/test-tag.t

	hook: -M b325cc5b642c5b465bdbe8c09627cb372de3d47d t7			hook: -M b325cc5b642c5b465bdbe8c09627cb372de3d47d t7
	hook: +M ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7			hook: +M ea918d56be86a4afc5a95312e8b6750e1428d9d2 t7
	$ hg merge --tool internal:tagmerge			$ hg merge --tool internal:tagmerge
	merging .hgtags			merging .hgtags
	automatic .hgtags merge failed			automatic .hgtags merge failed
	the following 1 tags are in conflict: t7			the following 1 tags are in conflict: t7
	automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)			automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)
	2 files updated, 0 files merged, 0 files removed, 1 files unresolved			2 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' 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 .hgtags			U .hgtags
	$ cat .hgtags			$ cat .hgtags
	6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase			6cee5c8f3e5b4ae1a3996d2f6489c3e08eb5aea7 tbase
	4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1			4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t1
	4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2			4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t2
	4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3			4f3e9b90005b68b4d8a3f4355cedc302a8364f5c t3

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4742		Jan 8 2018, 9:49 AM	★	★
Diff 2	4872	rHG41ef02ba329b194c228c91f35138b5cacb41aa25	Jan 8 2018, 9:11 AM	★	★