This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			mercurial/commands.py (2 lines)
M			tests/test-annotate.t (24 lines)
M			tests/test-conflict.t (2 lines)
M			tests/test-fastannotate-hg.t (12 lines)
M			tests/test-merge-changedelete.t (6 lines)
M			tests/test-merge-force.t (60 lines)
M			tests/test-merge-tools.t (32 lines)
M			tests/test-sparse.t (4 lines)

Status	Author	Revision
Closed	martinvonz	D12085 relnotes: add note about changed labels texts
Closed	martinvonz	D12025 graft: attempt to make merge labels more helpful
Closed	martinvonz	D12024 shelve: attempt to make merge labels more helpful
Closed	martinvonz	D12023 histedit: attempt to make merge labels more helpful
Closed	martinvonz	D12022 update: set custom conflict label for base commit
Closed	martinvonz	D12021 merge: set custom conflict label for base commit
Closed	martinvonz	D12020 rebase: set custom conflict label for base commit
Closed	martinvonz	D12019 simplemerge: take over formatting of label from `filemerge`
Closed	martinvonz	D12018 filemerge: pass `simplemerge.MergeInput` to tool functions
Closed	martinvonz	D12017 filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Closed	martinvonz	D12016 filemerge: always define a "base" label
Closed	martinvonz	D12015 filemerge: set default labels a little earlier
Closed	martinvonz	D12014 filemerge: remove unused arguments from `_merge()`
Closed	martinvonz	D12013 simplemerge: take arguments as annotated context objects
Closed	martinvonz	D12012 filemerge: make `labels` a required arg for `_premerge()`
Closed	martinvonz	D12011 filemerge: remove unnecessary check for empty string
Closed	martinvonz	D12010 tests: also test spaces in conflict marker labels

Diff 31834

mercurial/commands.py

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

	displayer.show(repo[node])			displayer.show(repo[node])
	displayer.close()			displayer.close()
	return 0			return 0

	# ui.forcemerge is an internal variable, do not document			# ui.forcemerge is an internal variable, do not document
	overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}			overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
	with ui.configoverride(overrides, b'merge'):			with ui.configoverride(overrides, b'merge'):
	force = opts.get(b'force')			force = opts.get(b'force')
	labels = [b'working copy', b'merge rev']			labels = [b'working copy', b'merge rev', b'common ancestor']
	return hg.merge(ctx, force=force, labels=labels)			return hg.merge(ctx, force=force, labels=labels)


	statemod.addunfinished(			statemod.addunfinished(
	b'merge',			b'merge',
	fname=None,			fname=None,
	clearable=True,			clearable=True,
	allowcommit=True,			allowcommit=True,

tests/test-annotate.t

	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, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat b			$ cat b
	a			a
	a			a
	a			a
	<<<<<<< working copy: 5fbdc1152d97 - test: b2.1			<<<<<<< working copy: 5fbdc1152d97 - test: b2.1
	b4			b4
	c			c
	b5			b5
	\|\|\|\|\|\|\| base: 3086dbafde1c - test: b			\|\|\|\|\|\|\| common ancestor: 3086dbafde1c - test: b
	=======			=======
	b4			b4
	b5			b5
	b6			b6
	>>>>>>> merge rev: 37ec9f5c3d1f - test: b2			>>>>>>> merge rev: 37ec9f5c3d1f - test: b2
	$ cat <<EOF > b			$ cat <<EOF > b
	> a			> a
	> a			> a
	> a			> a
	> b4			> b4
	> c			> c
	> b5			> b5
	> EOF			> EOF
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat qux			$ cat qux
	0			0
	0			0
	1 baz:1			1 baz:1
	2 baz:2			2 baz:2
	<<<<<<< working copy: 863de62655ef - test: baz:3+->3-			<<<<<<< working copy: 863de62655ef - test: baz:3+->3-
	3- baz:3			3- baz:3
	4 baz:4			4 baz:4
	\|\|\|\|\|\|\| base: 56fc739c091f - test: baz:3->3+			\|\|\|\|\|\|\| common ancestor: 56fc739c091f - test: baz:3->3+
	3+ baz:3			3+ baz:3
	4 baz:4			4 baz:4
	=======			=======
	3+ baz:3			3+ baz:3
	4+ baz:4			4+ baz:4
	>>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+			>>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+
	5			5
	6			6
	7			7
	$ cat > qux <<EOF			$ cat > qux <<EOF
	> 0			> 0
	> 0			> 0
	> 1 baz:1			> 1 baz:1
	> 2 baz:2			> 2 baz:2
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat qux			$ cat qux
	0			0
	0			0
	1 baz:1			1 baz:1
	2 baz:2			2 baz:2
	<<<<<<< working copy: cb8df70ae185 - test: qux:4->4+			<<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
	3+ baz:3			3+ baz:3
	4+ baz:4			4+ baz:4
	\|\|\|\|\|\|\| base: 56fc739c091f - test: baz:3->3+			\|\|\|\|\|\|\| common ancestor: 56fc739c091f - test: baz:3->3+
	3+ baz:3			3+ baz:3
	4 baz:4			4 baz:4
	=======			=======
	3- baz:3			3- baz:3
	4 baz:4			4 baz:4
	>>>>>>> merge rev: 863de62655ef - test: baz:3+->3-			>>>>>>> merge rev: 863de62655ef - test: baz:3+->3-
	5			5
	6			6
	7			7
	$ cat > qux <<EOF			$ cat > qux <<EOF
	> 0			> 0
	> 0			> 0
	> 1 baz:1			> 1 baz:1
	> 2 baz:2			> 2 baz:2
	$ hg commit -m a			$ hg commit -m a
	$ hg update '.^' -q			$ hg update '.^' -q
	$ echo 3 >> a			$ echo 3 >> a
	$ hg commit -m 3 -q			$ hg commit -m 3 -q
	$ hg merge 2 -q			$ hg merge 2 -q
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	[1]			[1]
	$ cat a			$ cat a
	<<<<<<< working copy: 0a068f0261cf - test: 3			<<<<<<< working copy: 0a068f0261cf - test: 3
	1			1
	2			2
	3			3
	\|\|\|\|\|\|\| base: 1ed24be7e7a0 - test: 2			\|\|\|\|\|\|\| common ancestor: 1ed24be7e7a0 - test: 2
	1			1
	2			2
	=======			=======
	a			a
	>>>>>>> merge rev: 9409851bc20a - test: a			>>>>>>> merge rev: 9409851bc20a - test: a
	$ cat > a << EOF			$ cat > a << EOF
	> b			> b
	> 1			> 1
	> 2			> 2
	> 3			> 3
	> a			> a
	> EOF			> EOF
	$ hg resolve --mark -q			$ hg resolve --mark -q

tests/test-conflict.t

	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	<<<<<<< working copy			<<<<<<< working copy
	1			1
	2			2
	3			3
	6			6
	8			8
	\|\|\|\|\|\|\| base			\|\|\|\|\|\|\| common ancestor
	One			One
	Two			Two
	Three			Three
	Four			Four
	Five			Five
	=======			=======
	1			1
	2			2

tests/test-fastannotate-hg.t

	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, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ cat b			$ cat b
	a			a
	a			a
	a			a
	<<<<<<< working copy: 5fbdc1152d97 - test: b2.1			<<<<<<< working copy: 5fbdc1152d97 - test: b2.1
	b4			b4
	c			c
	b5			b5
	\|\|\|\|\|\|\| base: 3086dbafde1c - test: b			\|\|\|\|\|\|\| common ancestor: 3086dbafde1c - test: b
	=======			=======
	b4			b4
	b5			b5
	b6			b6
	>>>>>>> merge rev: 37ec9f5c3d1f - test: b2			>>>>>>> merge rev: 37ec9f5c3d1f - test: b2
	$ cat <<EOF > b			$ cat <<EOF > b
	> a			> a
	> a			> a
	> a			> a
	> b4			> b4
	> c			> c
	> b5			> b5
	> EOF			> EOF
	$ hg commit -m a			$ hg commit -m a
	$ hg update '.^' -q			$ hg update '.^' -q
	$ echo 3 >> a			$ echo 3 >> a
	$ hg commit -m 3 -q			$ hg commit -m 3 -q
	$ hg merge 2 -q			$ hg merge 2 -q
	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	[1]			[1]
	$ cat a			$ cat a
	<<<<<<< working copy: 0a068f0261cf - test: 3			<<<<<<< working copy: 0a068f0261cf - test: 3
	1			1
	2			2
	3			3
	\|\|\|\|\|\|\| base: 1ed24be7e7a0 - test: 2			\|\|\|\|\|\|\| common ancestor: 1ed24be7e7a0 - test: 2
	1			1
	2			2
	=======			=======
	a			a
	>>>>>>> merge rev: 9409851bc20a - test: a			>>>>>>> merge rev: 9409851bc20a - test: a
	$ cat > a << EOF			$ cat > a << EOF
	> b			> b
	> 1			> 1
	> 2			> 2
	> 3			> 3
	> a			> a
	> EOF			> EOF
	$ hg resolve --mark -q			$ hg resolve --mark -q

tests/test-merge-changedelete.t

	--- file1 ---			--- file1 ---
	1			1
	changed			changed
	--- file2 ---			--- file2 ---
	2			2
	changed			changed
	--- file3 ---			--- file3 ---
	3			3
	<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...			<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c...
	changed2			changed2
	\|\|\|\|\|\|\| base: ab57bf49aa27 - test: added files			\|\|\|\|\|\|\| common ancestor: ab57bf49aa27 - test: added files
	=======			=======
	changed1			changed1
	>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...			>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c...

	Exercise transitions between local, other, fail and prompt, and make sure the			Exercise transitions between local, other, fail and prompt, and make sure the
	dirstate stays consistent. (Compare with each other and to the above			dirstate stays consistent. (Compare with each other and to the above
	invocations.)			invocations.)

	$ testtransitions() {			$ testtransitions() {
	> # this traversal order covers every transition			> # this traversal order covers every transition
	> tools="local other prompt local fail other local prompt other fail prompt fail local"			> tools="local other prompt local fail other local prompt other fail prompt fail local"

tests/test-merge-force.t


	M content1_content2_content1_content2-tracked			M content1_content2_content1_content2-tracked
	content2			content2

	M content1_content2_content1_content2-untracked			M content1_content2_content1_content2-untracked
	content2			content2

	M content1_content2_content1_content4-tracked			M content1_content2_content1_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 8ef80617fa20 - test: base			\|\|\|\|\|\|\| common ancestor: 8ef80617fa20 - test: base
	content1			content1
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M content1_content2_content1_content4-untracked			M content1_content2_content1_content4-untracked
	content2			content2

	M content1_content2_content1_missing-tracked			M content1_content2_content1_missing-tracked
	content2			content2

	M content1_content2_content1_missing-untracked			M content1_content2_content1_missing-untracked
	content2			content2

	M content1_content2_content2_content1-tracked			M content1_content2_content2_content1-tracked
	content2			content2

	M content1_content2_content2_content1-untracked			M content1_content2_content2_content1-untracked
	content2			content2

	C content1_content2_content2_content2-tracked			C content1_content2_content2_content2-tracked
	content2			content2

	M content1_content2_content2_content2-untracked			M content1_content2_content2_content2-untracked
	content2			content2

	M content1_content2_content2_content4-tracked			M content1_content2_content2_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 8ef80617fa20 - test: base			\|\|\|\|\|\|\| common ancestor: 8ef80617fa20 - test: base
	content1			content1
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M content1_content2_content2_content4-untracked			M content1_content2_content2_content4-untracked
	content2			content2

	M content1_content2_content2_missing-tracked			M content1_content2_content2_missing-tracked
	content2			content2

	M content1_content2_content2_missing-untracked			M content1_content2_content2_missing-untracked
	content2			content2

	M content1_content2_content3_content1-tracked			M content1_content2_content3_content1-tracked
	content2			content2

	M content1_content2_content3_content1-untracked			M content1_content2_content3_content1-untracked
	content2			content2

	M content1_content2_content3_content2-tracked			M content1_content2_content3_content2-tracked
	content2			content2

	M content1_content2_content3_content2-untracked			M content1_content2_content3_content2-untracked
	content2			content2

	M content1_content2_content3_content3-tracked			M content1_content2_content3_content3-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content3			content3
	\|\|\|\|\|\|\| base: 8ef80617fa20 - test: base			\|\|\|\|\|\|\| common ancestor: 8ef80617fa20 - test: base
	content1			content1
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M content1_content2_content3_content3-untracked			M content1_content2_content3_content3-untracked
	content2			content2

	M content1_content2_content3_content4-tracked			M content1_content2_content3_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 8ef80617fa20 - test: base			\|\|\|\|\|\|\| common ancestor: 8ef80617fa20 - test: base
	content1			content1
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M content1_content2_content3_content4-untracked			M content1_content2_content3_content4-untracked
	content2			content2

	M content1_content2_content3_missing-tracked			M content1_content2_content3_missing-tracked
	content2			content2

	M content1_content2_content3_missing-untracked			M content1_content2_content3_missing-untracked
	content2			content2

	M content1_content2_missing_content1-tracked			M content1_content2_missing_content1-tracked
	content2			content2

	M content1_content2_missing_content1-untracked			M content1_content2_missing_content1-untracked
	content2			content2

	M content1_content2_missing_content2-tracked			M content1_content2_missing_content2-tracked
	content2			content2

	M content1_content2_missing_content2-untracked			M content1_content2_missing_content2-untracked
	content2			content2

	M content1_content2_missing_content4-tracked			M content1_content2_missing_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 8ef80617fa20 - test: base			\|\|\|\|\|\|\| common ancestor: 8ef80617fa20 - test: base
	content1			content1
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M content1_content2_missing_content4-untracked			M content1_content2_missing_content4-untracked
	content2			content2

	M content1_content2_missing_missing-tracked			M content1_content2_missing_missing-tracked
	content2			content2

	M content1_content2_missing_missing-untracked			M content1_content2_missing_missing-untracked

	C missing_content2_content2_content2-tracked			C missing_content2_content2_content2-tracked
	content2			content2

	M missing_content2_content2_content2-untracked			M missing_content2_content2_content2-untracked
	content2			content2

	M missing_content2_content2_content4-tracked			M missing_content2_content2_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 000000000000 - :			\|\|\|\|\|\|\| common ancestor: 000000000000 - :
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M missing_content2_content2_content4-untracked			M missing_content2_content2_content4-untracked
	content2			content2

	M missing_content2_content2_missing-tracked			M missing_content2_content2_missing-tracked
	content2			content2

	M missing_content2_content2_missing-untracked			M missing_content2_content2_missing-untracked
	content2			content2

	M missing_content2_content3_content2-tracked			M missing_content2_content3_content2-tracked
	content2			content2

	M missing_content2_content3_content2-untracked			M missing_content2_content3_content2-untracked
	content2			content2

	M missing_content2_content3_content3-tracked			M missing_content2_content3_content3-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content3			content3
	\|\|\|\|\|\|\| base: 000000000000 - :			\|\|\|\|\|\|\| common ancestor: 000000000000 - :
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M missing_content2_content3_content3-untracked			M missing_content2_content3_content3-untracked
	content2			content2

	M missing_content2_content3_content4-tracked			M missing_content2_content3_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 000000000000 - :			\|\|\|\|\|\|\| common ancestor: 000000000000 - :
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M missing_content2_content3_content4-untracked			M missing_content2_content3_content4-untracked
	content2			content2

	M missing_content2_content3_missing-tracked			M missing_content2_content3_missing-tracked
	content2			content2

	M missing_content2_content3_missing-untracked			M missing_content2_content3_missing-untracked
	content2			content2

	M missing_content2_missing_content2-tracked			M missing_content2_missing_content2-tracked
	content2			content2

	M missing_content2_missing_content2-untracked			M missing_content2_missing_content2-untracked
	content2			content2

	M missing_content2_missing_content4-tracked			M missing_content2_missing_content4-tracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 000000000000 - :			\|\|\|\|\|\|\| common ancestor: 000000000000 - :
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M missing_content2_missing_content4-untracked			M missing_content2_missing_content4-untracked
	<<<<<<< working copy: 0447570f1af6 - test: local			<<<<<<< working copy: 0447570f1af6 - test: local
	content4			content4
	\|\|\|\|\|\|\| base: 000000000000 - :			\|\|\|\|\|\|\| common ancestor: 000000000000 - :
	=======			=======
	content2			content2
	>>>>>>> merge rev: 85100b8c675b - test: remote			>>>>>>> merge rev: 85100b8c675b - test: remote

	M missing_content2_missing_missing-tracked			M missing_content2_missing_missing-tracked
	content2			content2

	M missing_content2_missing_missing-untracked			M missing_content2_missing_missing-untracked
	content2			content2

	C missing_missing_content3_content3-tracked			C missing_missing_content3_content3-tracked

tests/test-merge-tools.t

	$ 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 4 --config merge-tools.true.premerge=keep-merge3			$ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
	merging f			merging f
	<<<<<<< working copy: ef83787e2614 - test: revision 1			<<<<<<< working copy: ef83787e2614 - test: revision 1
	revision 1			revision 1
	space			space
	\|\|\|\|\|\|\| base: ffd2bda21d6e - test: revision 0			\|\|\|\|\|\|\| common ancestor: ffd2bda21d6e - test: revision 0
	revision 0			revision 0
	space			space
	=======			=======
	revision 4			revision 4
	>>>>>>> merge rev: 81448d39c9a0 - test: revision 4			>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
	revision 0			revision 0
	space			space
	revision 4			revision 4
	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)
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	<<<<<<< working copy: ef83787e2614 - test: revision 1			<<<<<<< working copy: ef83787e2614 - test: revision 1
	revision 1			revision 1
	space			space
	\|\|\|\|\|\|\| base: ffd2bda21d6e - test: revision 0			\|\|\|\|\|\|\| common ancestor: ffd2bda21d6e - test: revision 0
	revision 0			revision 0
	space			space
	=======			=======
	revision 4			revision 4
	>>>>>>> merge rev: 81448d39c9a0 - test: revision 4			>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	R f			R f

	premerge=keep-mergediff keeps conflict markers with base content:			premerge=keep-mergediff keeps conflict markers with base content:

	$ 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 4 --config merge-tools.true.premerge=keep-mergediff			$ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff
	merging f			merging f
	<<<<<<<			<<<<<<<
	------- base: ffd2bda21d6e - test: revision 0			------- common ancestor: ffd2bda21d6e - test: revision 0
	+++++++ working copy: ef83787e2614 - test: revision 1			+++++++ working copy: ef83787e2614 - test: revision 1
	-revision 0			-revision 0
	+revision 1			+revision 1
	space			space
	======= merge rev: 81448d39c9a0 - test: revision 4			======= merge rev: 81448d39c9a0 - test: revision 4
	revision 4			revision 4
	>>>>>>>			>>>>>>>
	revision 0			revision 0
	space			space
	revision 4			revision 4
	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)
	$ aftermerge			$ aftermerge
	# cat f			# cat f
	<<<<<<<			<<<<<<<
	------- base: ffd2bda21d6e - test: revision 0			------- common ancestor: ffd2bda21d6e - test: revision 0
	+++++++ working copy: ef83787e2614 - test: revision 1			+++++++ working copy: ef83787e2614 - test: revision 1
	-revision 0			-revision 0
	+revision 1			+revision 1
	space			space
	======= merge rev: 81448d39c9a0 - test: revision 4			======= merge rev: 81448d39c9a0 - test: revision 4
	revision 4			revision 4
	>>>>>>>			>>>>>>>
	# hg stat			# hg stat
	M f			M f
	# hg resolve --list			# hg resolve --list
	R f			R f

	premerge=keep respects ui.mergemarkers=basic:			premerge=keep respects ui.mergemarkers=basic:
	> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \			> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
	> --config ui.mergemarkertemplate='uitmpl {rev}' \			> --config ui.mergemarkertemplate='uitmpl {rev}' \
	> --config ui.mergemarkers=detailed \			> --config ui.mergemarkers=detailed \
	> merge -r 2			> merge -r 2
	merging f			merging f
	arg: "ll:working copy"			arg: "ll:working copy"
	arg: "lo:"			arg: "lo:"
	arg: "merge rev"			arg: "merge rev"
	arg: "lb:base: /f~base." (glob)			arg: "lb:common ancestor: /f~base." (glob)
	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)
	$ rm -f 'printargs_merge_tool'			$ rm -f 'printargs_merge_tool'

	Same test with experimental.mergetempdirprefix set:			Same test with experimental.mergetempdirprefix set:

	$ beforemerge			$ beforemerge
	[merge-tools]			[merge-tools]
	> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \			> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
	> --config ui.mergemarkertemplate='uitmpl {rev}' \			> --config ui.mergemarkertemplate='uitmpl {rev}' \
	> --config ui.mergemarkers=detailed \			> --config ui.mergemarkers=detailed \
	> merge -r 2			> merge -r 2
	merging f			merging f
	arg: "ll:working copy"			arg: "ll:working copy"
	arg: "lo:"			arg: "lo:"
	arg: "merge rev"			arg: "merge rev"
	arg: "lb:base: /hgmerge./f~base" (glob)			arg: "lb:common ancestor: /hgmerge./f~base" (glob)
	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)
	$ rm -f 'printargs_merge_tool'			$ rm -f 'printargs_merge_tool'

	Merge using a tool that supports labellocal, labelother, and labelbase, checking			Merge using a tool that supports labellocal, labelother, and labelbase, checking
	that they're quoted properly as well. This is using 'detailed' mergemarkers,			that they're quoted properly as well. This is using 'detailed' mergemarkers,
	even though ui.mergemarkers is 'basic', and using the tool's			even though ui.mergemarkers is 'basic', and using the tool's
	mergemarkertemplate:			mergemarkertemplate:
	> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \			> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
	> --config ui.mergemarkertemplate='uitmpl {rev}' \			> --config ui.mergemarkertemplate='uitmpl {rev}' \
	> --config ui.mergemarkers=basic \			> --config ui.mergemarkers=basic \
	> merge -r 2			> merge -r 2
	merging f			merging f
	arg: "ll:working copy: tooltmpl ef83787e2614"			arg: "ll:working copy: tooltmpl ef83787e2614"
	arg: "lo:"			arg: "lo:"
	arg: "merge rev: tooltmpl 0185f4e0cf02"			arg: "merge rev: tooltmpl 0185f4e0cf02"
	arg: "lb:base: /f~base." (glob)			arg: "lb:common ancestor: /f~base." (glob)
	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)
	$ rm -f 'printargs_merge_tool'			$ rm -f 'printargs_merge_tool'

	The merge tool still gets labellocal and labelother as 'basic' even when			The merge tool still gets labellocal and labelother as 'basic' even when
	premerge=keep is used and has 'detailed' markers:			premerge=keep is used and has 'detailed' markers:

	$ beforemerge			$ beforemerge
	> --config ui.merge=testecho \			> --config ui.merge=testecho \
	> --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \			> --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \
	> --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc\|firstline} {separate(" ", tags, bookmarks, branch)}"}"'			> --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc\|firstline} {separate(" ", tags, bookmarks, branch)}"}"'
	merging b			merging b

	Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !)			Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !)
	Running merge tool for b (*/bin/echo): (glob) (no-windows !)			Running merge tool for b (*/bin/echo): (glob) (no-windows !)
	- local (working copy): 10:2d1f533d add binary file (#2) tip default			- local (working copy): 10:2d1f533d add binary file (#2) tip default
	- base (base): -1:00000000 default			- base (common ancestor): -1:00000000 default
	- other (merge rev): 9:1e7ad7d7 add binary file (#1) default			- other (merge rev): 9:1e7ad7d7 add binary file (#1) default
	merge runs here ...			merge runs here ...
	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)

	Check that debugpicktool examines which merge tool is chosen for			Check that debugpicktool examines which merge tool is chosen for
	specified file as expected			specified file as expected

tests/test-sparse.t

	$ hg debugsparse			$ hg debugsparse
	[exclude]			[exclude]
	hide*			hide*

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

	$ cat hide			$ cat hide
	<<<<<<< dest: 39278f7c08a9 - test: two			<<<<<<< dest: 39278f7c08a9 - test: two
	y			y
	=======			=======
	z			z
	>>>>>>> source: b91df4f39e75 - test: edit hide			>>>>>>> source: b91df4f39e75 - test: edit hide

	Verify aborting a rebase cleans up temporary files			Verify aborting a rebase cleans up temporary files

	$ hg rebase --abort --config extensions.rebase=			$ hg rebase --abort --config extensions.rebase=
	cleaned up 1 temporarily added file(s) from the sparse checkout			cleaned up 1 temporarily added file(s) from the sparse checkout
	rebase aborted			rebase aborted
	$ rm hide.orig			$ rm hide.orig

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31721		Jan 21 2022, 6:31 PM	★	★
Diff 2	31834	rHGa51c522c0064add4a76b2c28416c8f10c352a5b5	Jan 18 2022, 6:04 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

merge: set custom conflict label for base commitClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 31834

mercurial/commands.py

tests/test-annotate.t

tests/test-conflict.t

tests/test-fastannotate-hg.t

tests/test-merge-changedelete.t

tests/test-merge-force.t

tests/test-merge-tools.t

tests/test-sparse.t

merge: set custom conflict label for base commit
ClosedPublic

Revision Contents
Changeset List