diff --git a/mercurial/commands.py b/mercurial/commands.py index 8e805cf27caa48b4000887e4c40fdbacffe263b5_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..940c05b25b079ee1c727cdc4d0546dd87dc480d4_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5532,7 +5532,9 @@ # ui.forcemerge is an internal variable, do not document repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') force = opts.get('force') - return hg.merge(repo, node, force=force, mergeforce=force) + labels = ['working copy', 'merge rev'] + return hg.merge(repo, node, force=force, mergeforce=force, + labels=labels) finally: ui.setconfig('ui', 'forcemerge', '', 'merge') diff --git a/mercurial/hg.py b/mercurial/hg.py index 8e805cf27caa48b4000887e4c40fdbacffe263b5_bWVyY3VyaWFsL2hnLnB5..940c05b25b079ee1c727cdc4d0546dd87dc480d4_bWVyY3VyaWFsL2hnLnB5 100644 --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -768,6 +768,6 @@ return ret -def merge(repo, node, force=None, remind=True, mergeforce=False): +def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None): """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" @@ -772,6 +772,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" - stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce) + stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce, + labels=labels) _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA==..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA== 100644 --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -638,7 +638,7 @@ (no more unresolved files) $ hg ci -m 'merge bar' $ hg log --config diff.git=1 -pr . - changeset: 23:93cd4445f720 + changeset: 23:69c24fe01e35 tag: tip parent: 22:30d96aeaf27b parent: 21:1aa437659d19 @@ -653,7 +653,7 @@ --- a/cc +++ b/cc @@ -1,1 +1,5 @@ - +<<<<<<< local: 30d96aeaf27b - test: aa + +<<<<<<< working copy: 30d96aeaf27b - test: aa dd +======= +cc @@ -657,7 +657,7 @@ dd +======= +cc - +>>>>>>> other: 1aa437659d19 bar - test: aazzcc + +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc diff --git a/z b/zz rename from z rename to zz @@ -671,7 +671,7 @@ $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit HGEDITFORM=commit.amend.merge $ hg log --config diff.git=1 -pr . - changeset: 24:832b50f2c271 + changeset: 24:cfa2fbef3169 tag: tip parent: 22:30d96aeaf27b parent: 21:1aa437659d19 @@ -686,7 +686,7 @@ --- a/cc +++ b/cc @@ -1,1 +1,5 @@ - +<<<<<<< local: 30d96aeaf27b - test: aa + +<<<<<<< working copy: 30d96aeaf27b - test: aa dd +======= +cc @@ -690,7 +690,7 @@ dd +======= +cc - +>>>>>>> other: 1aa437659d19 bar - test: aazzcc + +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc diff --git a/z b/zz rename from z rename to zz @@ -704,7 +704,7 @@ $ hg mv zz z $ hg ci --amend -m 'merge bar (undo rename)' $ hg log --config diff.git=1 -pr . - changeset: 26:bdafc5c72f74 + changeset: 26:c34de68b014c tag: tip parent: 22:30d96aeaf27b parent: 21:1aa437659d19 @@ -719,7 +719,7 @@ --- a/cc +++ b/cc @@ -1,1 +1,5 @@ - +<<<<<<< local: 30d96aeaf27b - test: aa + +<<<<<<< working copy: 30d96aeaf27b - test: aa dd +======= +cc @@ -723,7 +723,7 @@ dd +======= +cc - +>>>>>>> other: 1aa437659d19 bar - test: aazzcc + +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc $ hg debugrename z z not renamed @@ -740,5 +740,5 @@ $ echo aa >> aaa $ hg ci -m 'merge bar again' $ hg log --config diff.git=1 -pr . - changeset: 28:32f19415b634 + changeset: 28:37d40dcef03b tag: tip @@ -744,5 +744,5 @@ tag: tip - parent: 26:bdafc5c72f74 + parent: 26:c34de68b014c parent: 27:4c94d5bc65f5 user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -775,5 +775,5 @@ $ hg mv aaa aa $ hg ci --amend -m 'merge bar again (undo rename)' $ hg log --config diff.git=1 -pr . - changeset: 30:1e2a06b3d312 + changeset: 30:537c6d1b3633 tag: tip @@ -779,5 +779,5 @@ tag: tip - parent: 26:bdafc5c72f74 + parent: 26:c34de68b014c parent: 27:4c94d5bc65f5 user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -813,7 +813,7 @@ $ hg merge -q bar --config ui.interactive=True << EOF > c > EOF - local changed aa which other deleted + local [working copy] changed aa which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? c $ hg ci -m 'merge bar (with conflicts)' $ hg log --config diff.git=1 -pr . @@ -817,5 +817,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? c $ hg ci -m 'merge bar (with conflicts)' $ hg log --config diff.git=1 -pr . - changeset: 33:97a298b0c59f + changeset: 33:7afcba911942 tag: tip @@ -821,5 +821,5 @@ tag: tip - parent: 32:3d78ce4226b8 + parent: 32:6075d69d215d parent: 31:67db8847a540 user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -829,5 +829,5 @@ $ hg rm aa $ hg ci --amend -m 'merge bar (with conflicts, amended)' $ hg log --config diff.git=1 -pr . - changeset: 35:6de0c1bde1c8 + changeset: 35:376965e47ddd tag: tip @@ -833,5 +833,5 @@ tag: tip - parent: 32:3d78ce4226b8 + parent: 32:6075d69d215d parent: 31:67db8847a540 user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -927,7 +927,7 @@ HG: M: HG: A: foo HG: R: - HG: diff -r 6de0c1bde1c8 foo + HG: diff -r 376965e47ddd foo HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ @@ -941,8 +941,8 @@ HG: M: HG: A: foo y HG: R: - HG: diff -r 6de0c1bde1c8 foo + HG: diff -r 376965e47ddd foo HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo @@ -945,8 +945,8 @@ HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo - HG: diff -r 6de0c1bde1c8 y + HG: diff -r 376965e47ddd y HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ @@ -959,9 +959,9 @@ HG: M: HG: A: foo y HG: R: a - HG: diff -r 6de0c1bde1c8 a + HG: diff -r 376965e47ddd a HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a @@ -963,10 +963,10 @@ HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a - HG: diff -r 6de0c1bde1c8 foo + HG: diff -r 376965e47ddd foo HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo @@ -969,8 +969,8 @@ HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo - HG: diff -r 6de0c1bde1c8 y + HG: diff -r 376965e47ddd y HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ @@ -983,9 +983,9 @@ HG: M: HG: A: foo y HG: R: a x - HG: diff -r 6de0c1bde1c8 a + HG: diff -r 376965e47ddd a HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a @@ -987,10 +987,10 @@ HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a - HG: diff -r 6de0c1bde1c8 foo + HG: diff -r 376965e47ddd foo HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo @@ -993,9 +993,9 @@ HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo - HG: diff -r 6de0c1bde1c8 x + HG: diff -r 376965e47ddd x HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,1 +0,0 @@ HG: -x @@ -998,8 +998,8 @@ HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,1 +0,0 @@ HG: -x - HG: diff -r 6de0c1bde1c8 y + HG: diff -r 376965e47ddd y HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ @@ -1014,9 +1014,9 @@ HG: M: HG: A: foo y HG: R: a x - HG: diff -r 6de0c1bde1c8 a + HG: diff -r 376965e47ddd a HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a @@ -1018,10 +1018,10 @@ HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,2 +0,0 @@ HG: -a HG: -a - HG: diff -r 6de0c1bde1c8 foo + HG: diff -r 376965e47ddd foo HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo @@ -1024,9 +1024,9 @@ HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ HG: +foo - HG: diff -r 6de0c1bde1c8 x + HG: diff -r 376965e47ddd x HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,1 +0,0 @@ HG: -x @@ -1029,8 +1029,8 @@ HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: @@ -1,1 +0,0 @@ HG: -x - HG: diff -r 6de0c1bde1c8 y + HG: diff -r 376965e47ddd y HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: @@ -0,0 +1,1 @@ diff --git a/tests/test-conflict.t b/tests/test-conflict.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1jb25mbGljdC50..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1jb25mbGljdC50 100644 --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -49,9 +49,9 @@ 1 2 3 - <<<<<<< local: 618808747361 - test: branch2 + <<<<<<< working copy: 618808747361 - test: branch2 6 8 ======= 4 5 @@ -53,9 +53,9 @@ 6 8 ======= 4 5 - >>>>>>> other: c0c68e4fe667 - test: branch1 + >>>>>>> merge rev: c0c68e4fe667 - test: branch1 Hop we are done. $ hg status @@ -79,9 +79,9 @@ 1 2 3 - <<<<<<< local: test 2 + <<<<<<< working copy: test 2 6 8 ======= 4 5 @@ -83,9 +83,9 @@ 6 8 ======= 4 5 - >>>>>>> other: test 1 + >>>>>>> merge rev: test 1 Hop we are done. Verify line splitting of custom conflict marker which causes multiple lines @@ -105,9 +105,9 @@ 1 2 3 - <<<<<<< local: test 2 + <<<<<<< working copy: test 2 6 8 ======= 4 5 @@ -109,9 +109,9 @@ 6 8 ======= 4 5 - >>>>>>> other: test 1 + >>>>>>> merge rev: test 1 Hop we are done. Verify line trimming of custom conflict marker using multi-byte characters @@ -144,9 +144,9 @@ 1 2 3 - <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) + <<<<<<< working copy: 1234567890123456789012345678901234567890123456789012345... 6 8 ======= 4 5 @@ -148,9 +148,9 @@ 6 8 ======= 4 5 - >>>>>>> other: branch1 + >>>>>>> merge rev: branch1 Hop we are done. Verify basic conflict markers @@ -170,9 +170,9 @@ 1 2 3 - <<<<<<< local + <<<<<<< working copy 6 8 ======= 4 5 @@ -174,9 +174,9 @@ 6 8 ======= 4 5 - >>>>>>> other + >>>>>>> merge rev Hop we are done. internal:merge3 @@ -191,7 +191,7 @@ [1] $ cat a Small Mathematical Series. - <<<<<<< local + <<<<<<< working copy 1 2 3 @@ -209,7 +209,7 @@ 3 4 5 - >>>>>>> other + >>>>>>> merge rev Hop we are done. Add some unconflicting changes on each head, to make sure we really diff --git a/tests/test-keyword.t b/tests/test-keyword.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1rZXl3b3JkLnQ=..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1rZXl3b3JkLnQ= 100644 --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -1113,7 +1113,7 @@ [1] $ cat m $Id$ - <<<<<<< local: 88a80c8d172e - test: 8bar + <<<<<<< working copy: 88a80c8d172e - test: 8bar bar ======= foo @@ -1117,7 +1117,7 @@ bar ======= foo - >>>>>>> other: 85d2d2d732a5 - test: simplemerge + >>>>>>> merge rev: 85d2d2d732a5 - test: simplemerge resolve to local, m must contain hash of last change (local parent) diff --git a/tests/test-merge-changedelete.t b/tests/test-merge-changedelete.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZS1jaGFuZ2VkZWxldGUudA==..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZS1jaGFuZ2VkZWxldGUudA== 100644 --- a/tests/test-merge-changedelete.t +++ b/tests/test-merge-changedelete.t @@ -54,5 +54,5 @@ Non-interactive merge: $ hg merge -y - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -58,5 +58,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging file3 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') @@ -77,6 +77,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -100,7 +103,7 @@ changed --- file3 --- 3 - <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3 + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... changed2 ======= changed1 @@ -104,7 +107,7 @@ changed2 ======= changed1 - >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3 + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... Interactive merge: @@ -117,5 +120,5 @@ > c > d > EOF - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? c @@ -121,5 +124,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? c - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d merging file3 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') @@ -140,6 +143,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -161,7 +167,7 @@ *** file2 does not exist --- file3 --- 3 - <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3 + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... changed2 ======= changed1 @@ -165,7 +171,7 @@ changed2 ======= changed1 - >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3 + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... Interactive merge with bad input: @@ -181,6 +187,6 @@ > baz > c > EOF - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? foo unrecognized response @@ -185,5 +191,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? foo unrecognized response - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? bar unrecognized response @@ -188,4 +194,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? bar unrecognized response - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? d @@ -191,4 +197,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? d - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz unrecognized response @@ -193,6 +199,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz unrecognized response - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c merging file3 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') @@ -213,6 +219,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -234,7 +243,7 @@ changed --- file3 --- 3 - <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3 + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... changed2 ======= changed1 @@ -238,7 +247,7 @@ changed2 ======= changed1 - >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3 + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... Interactive merge with not enough input: @@ -250,5 +259,5 @@ $ hg merge --config ui.interactive=true <<EOF > d > EOF - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? d @@ -254,5 +263,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? d - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? merging file3 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') @@ -273,6 +282,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -294,7 +306,7 @@ changed --- file3 --- 3 - <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3 + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... changed2 ======= changed1 @@ -298,7 +310,7 @@ changed2 ======= changed1 - >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3 + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... Choose local versions of files @@ -322,6 +334,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -367,6 +382,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -413,6 +431,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -445,5 +466,5 @@ 1 other heads for branch "default" $ hg merge --config ui.interactive=True --tool :prompt - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? @@ -449,4 +470,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 @@ -451,6 +472,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? 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 [1] @@ -467,6 +488,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -501,5 +525,5 @@ 1 other heads for branch "default" $ hg merge --tool :prompt - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -505,4 +529,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u no tool found to merge file3 @@ -507,6 +531,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u no tool found to merge file3 - keep (l)ocal, take (o)ther, or leave (u)nresolved? u + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u 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 [1] @@ -523,6 +547,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -555,5 +582,5 @@ 1 other heads for branch "default" $ hg merge --tool :merge3 - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -559,5 +586,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging file3 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') @@ -577,6 +604,9 @@ * version 2 records local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") @@ -600,8 +630,8 @@ changed --- file3 --- 3 - <<<<<<< local: 13910f48cf7b - test: changed file1, removed file2, changed file3 + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... changed2 ||||||| base ======= changed1 @@ -604,8 +634,8 @@ changed2 ||||||| base ======= changed1 - >>>>>>> other: 10f9a0a634e8 - test: removed file1, changed file2, changed file3 + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, cha... Exercise transitions between local, other, fail and prompt, and make sure the dirstate stays consistent. (Compare with each other and to the above @@ -642,5 +672,5 @@ (status identical) === :other -> :prompt === - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? @@ -646,4 +676,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 @@ -648,6 +678,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? --- diff of status --- (status identical) @@ -671,5 +701,5 @@ (status identical) === :local -> :prompt === - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? @@ -675,4 +705,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 @@ -677,6 +707,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? --- diff of status --- (status identical) @@ -690,5 +720,5 @@ (status identical) === :fail -> :prompt === - local changed file1 which other deleted + local [working copy] changed file1 which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? @@ -694,4 +724,4 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? - other changed file2 which local deleted + other [merge rev] changed file2 which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 @@ -696,6 +726,6 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? no tool found to merge file3 - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? --- diff of status --- (status identical) diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZS1mb3JjZS50..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZS1mb3JjZS50 100644 --- a/tests/test-merge-force.t +++ b/tests/test-merge-force.t @@ -142,5 +142,5 @@ # in the same way, so it could potentially be left alone $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 - local changed content1_missing_content1_content4-tracked which other deleted + local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -146,3 +146,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_content3_content3-tracked which other deleted + local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -148,3 +148,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_content3_content4-tracked which other deleted + local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -150,3 +150,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_missing_content4-tracked which other deleted + local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -152,3 +152,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - other changed content1_content2_content1_content1-untracked which local deleted + other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -154,3 +154,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_content2-untracked which local deleted + other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -156,3 +156,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_content4-untracked which local deleted + other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -158,3 +158,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_missing-tracked which local deleted + other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -160,3 +160,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_missing-untracked which local deleted + other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -162,3 +162,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_content1-untracked which local deleted + other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -164,3 +164,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_content2-untracked which local deleted + other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -166,3 +166,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_content4-untracked which local deleted + other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -168,3 +168,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_missing-tracked which local deleted + other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -170,3 +170,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_missing-untracked which local deleted + other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -172,3 +172,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_content1-untracked which local deleted + other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -174,3 +174,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_content2-untracked which local deleted + other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -176,3 +176,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_content3-untracked which local deleted + other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -178,3 +178,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_content4-untracked which local deleted + other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -180,3 +180,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_missing-tracked which local deleted + other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -182,3 +182,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_missing-untracked which local deleted + other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -184,3 +184,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_content1-untracked which local deleted + other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -186,3 +186,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_content2-untracked which local deleted + other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -188,3 +188,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_content4-untracked which local deleted + other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -190,3 +190,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_missing-tracked which local deleted + other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -192,5 +192,5 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_missing-untracked which local deleted + other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content1_content4-tracked merging content1_content2_content2_content1-tracked @@ -373,9 +373,9 @@ content2 M content1_content2_content1_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base content1 ======= content2 @@ -377,9 +377,9 @@ content4 ||||||| base content1 ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M content1_content2_content1_content4-untracked content2 @@ -403,9 +403,9 @@ content2 M content1_content2_content2_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base content1 ======= content2 @@ -407,9 +407,9 @@ content4 ||||||| base content1 ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M content1_content2_content2_content4-untracked content2 @@ -433,9 +433,9 @@ content2 M content1_content2_content3_content3-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content3 ||||||| base content1 ======= content2 @@ -437,11 +437,11 @@ content3 ||||||| base content1 ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M content1_content2_content3_content3-untracked content2 M content1_content2_content3_content4-tracked @@ -443,11 +443,11 @@ M content1_content2_content3_content3-untracked content2 M content1_content2_content3_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base content1 ======= content2 @@ -449,9 +449,9 @@ content4 ||||||| base content1 ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M content1_content2_content3_content4-untracked content2 @@ -475,9 +475,9 @@ content2 M content1_content2_missing_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base content1 ======= content2 @@ -479,9 +479,9 @@ content4 ||||||| base content1 ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M content1_content2_missing_content4-untracked content2 @@ -559,8 +559,8 @@ content2 M missing_content2_content2_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base ======= content2 @@ -563,8 +563,8 @@ content4 ||||||| base ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M missing_content2_content2_content4-untracked content2 @@ -582,8 +582,8 @@ content2 M missing_content2_content3_content3-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content3 ||||||| base ======= content2 @@ -586,10 +586,10 @@ content3 ||||||| base ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M missing_content2_content3_content3-untracked content2 M missing_content2_content3_content4-tracked @@ -591,10 +591,10 @@ M missing_content2_content3_content3-untracked content2 M missing_content2_content3_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base ======= content2 @@ -597,8 +597,8 @@ content4 ||||||| base ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M missing_content2_content3_content4-untracked content2 @@ -616,8 +616,8 @@ content2 M missing_content2_missing_content4-tracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base ======= content2 @@ -620,7 +620,7 @@ content4 ||||||| base ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M missing_content2_missing_content4-untracked @@ -625,7 +625,7 @@ M missing_content2_missing_content4-untracked - <<<<<<< local: 0447570f1af6 - test: local + <<<<<<< working copy: 0447570f1af6 - test: local content4 ||||||| base ======= content2 @@ -628,8 +628,8 @@ content4 ||||||| base ======= content2 - >>>>>>> other: 85100b8c675b - test: remote + >>>>>>> merge rev: 85100b8c675b - test: remote M missing_content2_missing_missing-tracked content2 @@ -703,5 +703,5 @@ (no more unresolved files) $ hg resolve --unmark --all $ hg resolve --all --tool internal:merge3 - other changed content1_content2_content1_content1-untracked which local deleted + other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -707,4 +707,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_content2-untracked which local deleted + other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content1_content4-tracked @@ -709,4 +709,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content1_content4-tracked - other changed content1_content2_content1_content4-untracked which local deleted + other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -712,3 +712,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_missing-tracked which local deleted + other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -714,4 +714,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content1_missing-untracked which local deleted + other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content2_content1-tracked @@ -716,4 +716,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content2_content1-tracked - other changed content1_content2_content2_content1-untracked which local deleted + other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -719,4 +719,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_content2-untracked which local deleted + other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content2_content4-tracked @@ -721,4 +721,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content2_content4-tracked - other changed content1_content2_content2_content4-untracked which local deleted + other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -724,3 +724,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_missing-tracked which local deleted + other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -726,4 +726,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content2_missing-untracked which local deleted + other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content1-tracked @@ -728,4 +728,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content1-tracked - other changed content1_content2_content3_content1-untracked which local deleted + other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -731,4 +731,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_content2-untracked which local deleted + other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content3-tracked @@ -733,5 +733,5 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content3-tracked - other changed content1_content2_content3_content3-untracked which local deleted + other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content4-tracked @@ -736,4 +736,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_content3_content4-tracked - other changed content1_content2_content3_content4-untracked which local deleted + other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -739,3 +739,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_missing-tracked which local deleted + other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -741,4 +741,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_content3_missing-untracked which local deleted + other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_missing_content1-tracked @@ -743,4 +743,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_missing_content1-tracked - other changed content1_content2_missing_content1-untracked which local deleted + other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -746,4 +746,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_content2-untracked which local deleted + other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_missing_content4-tracked @@ -748,4 +748,4 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging content1_content2_missing_content4-tracked - other changed content1_content2_missing_content4-untracked which local deleted + other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -751,3 +751,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_missing-tracked which local deleted + other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -753,3 +753,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - other changed content1_content2_missing_missing-untracked which local deleted + other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u @@ -755,3 +755,3 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u - local changed content1_missing_content1_content4-tracked which other deleted + local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -757,3 +757,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_content3_content3-tracked which other deleted + local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -759,3 +759,3 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_content3_content4-tracked which other deleted + local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u @@ -761,5 +761,5 @@ use (c)hanged version, (d)elete, or leave (u)nresolved? u - local changed content1_missing_missing_content4-tracked which other deleted + local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u merging missing_content2_content2_content4-tracked merging missing_content2_content3_content3-tracked diff --git a/tests/test-merge-remove.t b/tests/test-merge-remove.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZS1yZW1vdmUudA==..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZS1yZW1vdmUudA== 100644 --- a/tests/test-merge-remove.t +++ b/tests/test-merge-remove.t @@ -102,7 +102,7 @@ Those who use force will lose $ hg merge -f - other changed bar which local deleted + other [merge rev] changed bar which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging foo1 and foo to foo1 0 files updated, 1 files merged, 0 files removed, 1 files unresolved diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZS10b29scy50..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZS10b29scy50 100644 --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -75,7 +75,7 @@ [1] $ aftermerge # cat f - <<<<<<< local: ef83787e2614 - test: revision 1 + <<<<<<< working copy: ef83787e2614 - test: revision 1 revision 1 ======= revision 2 @@ -79,7 +79,7 @@ revision 1 ======= revision 2 - >>>>>>> other: 0185f4e0cf02 - test: revision 2 + >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 space # hg stat M f @@ -532,7 +532,7 @@ # hg update -C 1 $ hg merge -r 2 --config ui.merge=internal:prompt no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? u + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u 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 [1] @@ -557,7 +557,7 @@ > u > EOF no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? u + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u 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 [1] @@ -580,7 +580,7 @@ # hg update -C 1 $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? 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 [1] @@ -594,7 +594,7 @@ U f $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? [1] $ aftermerge # cat f @@ -608,7 +608,7 @@ $ rm f $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? [1] $ aftermerge # cat f @@ -620,7 +620,7 @@ U f $ hg resolve --all --config ui.merge=internal:prompt no tool found to merge f - keep (l)ocal, take (o)ther, or leave (u)nresolved? u + keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u [1] $ aftermerge # cat f @@ -935,8 +935,8 @@ # hg update -C 1 $ hg merge -r 4 --config merge-tools.true.premerge=keep merging f - <<<<<<< local: ef83787e2614 - test: revision 1 + <<<<<<< working copy: ef83787e2614 - test: revision 1 revision 1 space ======= revision 4 @@ -939,8 +939,8 @@ revision 1 space ======= revision 4 - >>>>>>> other: 81448d39c9a0 - test: revision 4 + >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 revision 0 space revision 4 @@ -948,8 +948,8 @@ (branch merge, don't forget to commit) $ aftermerge # cat f - <<<<<<< local: ef83787e2614 - test: revision 1 + <<<<<<< working copy: ef83787e2614 - test: revision 1 revision 1 space ======= revision 4 @@ -952,8 +952,8 @@ revision 1 space ======= revision 4 - >>>>>>> other: 81448d39c9a0 - test: revision 4 + >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 # hg stat M f # hg resolve --list @@ -969,7 +969,7 @@ # hg update -C 1 $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 merging f - <<<<<<< local: ef83787e2614 - test: revision 1 + <<<<<<< working copy: ef83787e2614 - test: revision 1 revision 1 space ||||||| base @@ -977,7 +977,7 @@ space ======= revision 4 - >>>>>>> other: 81448d39c9a0 - test: revision 4 + >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 revision 0 space revision 4 @@ -985,7 +985,7 @@ (branch merge, don't forget to commit) $ aftermerge # cat f - <<<<<<< local: ef83787e2614 - test: revision 1 + <<<<<<< working copy: ef83787e2614 - test: revision 1 revision 1 space ||||||| base @@ -993,7 +993,7 @@ space ======= revision 4 - >>>>>>> other: 81448d39c9a0 - test: revision 4 + >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 # hg stat M f # hg resolve --list diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZS10eXBlcy50..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZS10eXBlcy50 100644 --- a/tests/test-merge-types.t +++ b/tests/test-merge-types.t @@ -356,7 +356,7 @@ U h $ tellmeabout a a is a plain file with content: - <<<<<<< local: 0139c5610547 - test: 2 + <<<<<<< working copy: 0139c5610547 - test: 2 2 ======= 1 @@ -360,6 +360,6 @@ 2 ======= 1 - >>>>>>> other: 97e29675e796 - test: 1 + >>>>>>> merge rev: 97e29675e796 - test: 1 $ tellmeabout b b is a plain file with content: @@ -364,6 +364,6 @@ $ tellmeabout b b is a plain file with content: - <<<<<<< local: 0139c5610547 - test: 2 + <<<<<<< working copy: 0139c5610547 - test: 2 2 ======= 1 @@ -367,7 +367,7 @@ 2 ======= 1 - >>>>>>> other: 97e29675e796 - test: 1 + >>>>>>> merge rev: 97e29675e796 - test: 1 $ tellmeabout c c is a plain file with content: x @@ -409,7 +409,7 @@ [1] $ tellmeabout a a is a plain file with content: - <<<<<<< local: 97e29675e796 - test: 1 + <<<<<<< working copy: 97e29675e796 - test: 1 1 ======= 2 @@ -413,6 +413,6 @@ 1 ======= 2 - >>>>>>> other: 0139c5610547 - test: 2 + >>>>>>> merge rev: 0139c5610547 - test: 2 $ tellmeabout b b is an executable file with content: @@ -417,6 +417,6 @@ $ tellmeabout b b is an executable file with content: - <<<<<<< local: 97e29675e796 - test: 1 + <<<<<<< working copy: 97e29675e796 - test: 1 1 ======= 2 @@ -420,7 +420,7 @@ 1 ======= 2 - >>>>>>> other: 0139c5610547 - test: 2 + >>>>>>> merge rev: 0139c5610547 - test: 2 $ tellmeabout c c is an executable file with content: x diff --git a/tests/test-merge7.t b/tests/test-merge7.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1tZXJnZTcudA==..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1tZXJnZTcudA== 100644 --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -99,7 +99,7 @@ $ cat test.txt one - <<<<<<< local: 50c3a7e29886 - test: Merge 1 + <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 two-point-five ======= two-point-one @@ -103,7 +103,7 @@ two-point-five ======= two-point-one - >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one + >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one three $ hg debugindex test.txt diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1yZW5hbWUtZGlyLW1lcmdlLnQ=..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1yZW5hbWUtZGlyLW1lcmdlLnQ= 100644 --- a/tests/test-rename-dir-merge.t +++ b/tests/test-rename-dir-merge.t @@ -144,7 +144,7 @@ C b/a C b/b $ cat b/c - <<<<<<< local: f1c50ca4f127 - test: new file in target directory + <<<<<<< working copy: f1c50ca4f127 - test: new file in target directory target ======= baz @@ -148,7 +148,7 @@ target ======= baz - >>>>>>> other: ce36d17b18fb - test: 2 add a/c + >>>>>>> merge rev: ce36d17b18fb - test: 2 add a/c $ rm b/c.orig Remote directory rename with conflicting file added in remote target directory @@ -177,7 +177,7 @@ ? a/d ? b/c.orig $ cat b/c - <<<<<<< local: ce36d17b18fb - test: 2 add a/c + <<<<<<< working copy: ce36d17b18fb - test: 2 add a/c baz ======= target @@ -181,7 +181,7 @@ baz ======= target - >>>>>>> other: f1c50ca4f127 - test: new file in target directory + >>>>>>> merge rev: f1c50ca4f127 - test: new file in target directory Second scenario with two repos: diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UyLnQ=..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UyLnQ= 100644 --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -694,7 +694,7 @@ starting 4 threads for background file closing (?) a: prompt deleted/changed -> m (premerge) picked tool ':prompt' for a (binary False symlink False changedelete True) - other changed a which local deleted + other [merge rev] changed a which local [working copy] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u b: both created -> m (premerge) picked tool 'python ../merge' for b (binary False symlink False changedelete False) @@ -739,7 +739,7 @@ starting 4 threads for background file closing (?) a: prompt changed/deleted -> m (premerge) picked tool ':prompt' for a (binary False symlink False changedelete True) - local changed a which other deleted + local [working copy] changed a which other [merge rev] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? u b: both created -> m (premerge) picked tool 'python ../merge' for b (binary False symlink False changedelete False) diff --git a/tests/test-resolve.t b/tests/test-resolve.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1yZXNvbHZlLnQ=..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1yZXNvbHZlLnQ= 100644 --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -290,6 +290,9 @@ * version 2 records local: 57653b9f834a4493f7240b0681efcb9ae7cab745 other: dc77451844e37f03f5c559e3b8529b2b48d381d1 + labels: + local: working copy + other: merge rev unrecognized entry: x advisory record file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac) file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) @@ -312,6 +315,9 @@ * version 2 records local: 57653b9f834a4493f7240b0681efcb9ae7cab745 other: dc77451844e37f03f5c559e3b8529b2b48d381d1 + labels: + local: working copy + other: merge rev file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac) file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) local path: file1 (flags "") diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1zdWJyZXBvLWdpdC50..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1zdWJyZXBvLWdpdC50 100644 --- a/tests/test-subrepo-git.t +++ b/tests/test-subrepo-git.t @@ -171,7 +171,7 @@ (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge 2>/dev/null subrepository s diverged (local revision: 7969594, remote revision: aa84837) - (M)erge, keep (l)ocal or keep (r)emote? m + (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m pulling subrepo s from $TESTTMP/gitroot 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t index 8e805cf27caa48b4000887e4c40fdbacffe263b5_dGVzdHMvdGVzdC1zdWJyZXBvLnQ=..940c05b25b079ee1c727cdc4d0546dd87dc480d4_dGVzdHMvdGVzdC1zdWJyZXBvLnQ= 100644 --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -304,7 +304,7 @@ subrepo t: both sides changed subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) starting 4 threads for background file closing (?) - (M)erge, keep (l)ocal or keep (r)emote? m + (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m merging subrepo t searching for copies back to rev 2 resolving manifests @@ -349,7 +349,7 @@ local removed, remote changed, keep changed $ hg merge 6 - remote changed subrepository s which local removed + remote [merge rev] changed subrepository s which local [working copy] removed use (c)hanged version or (d)elete? c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -380,7 +380,7 @@ $ hg merge --config ui.interactive=true 6 <<EOF > d > EOF - remote changed subrepository s which local removed + remote [merge rev] changed subrepository s which local [working copy] removed use (c)hanged version or (d)elete? d 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -404,7 +404,7 @@ $ hg co -C 6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge 11 - local changed subrepository s which remote removed + local [working copy] changed subrepository s which remote [merge rev] removed use (c)hanged version or (d)elete? c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -436,7 +436,7 @@ $ hg merge --config ui.interactive=true 11 <<EOF > d > EOF - local changed subrepository s which remote removed + local [working copy] changed subrepository s which remote [merge rev] removed use (c)hanged version or (d)elete? d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -860,7 +860,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge 4 # try to merge default into br again subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) - (M)erge, keep (l)ocal or keep (r)emote? m + (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ cd ..