filemerge: fix the wrong placements of messages in prompt
Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.
Thanks to Yuya who spotted this.
Differential Revision: https://phab.mercurial-scm.org/D4375
--- a/mercurial/filemerge.py Sat Aug 25 21:17:34 2018 +0300
+++ b/mercurial/filemerge.py Sun Aug 26 19:14:26 2018 +0300
@@ -56,13 +56,13 @@
fullmerge = internaltool.fullmerge # both premerge and merge
_localchangedotherdeletedmsg = _(
- "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
+ "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
"What do you want to do?\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _(
- "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
+ "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
"What do you want to do?\n"
"use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?"
--- a/tests/test-commit-amend.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-commit-amend.t Sun Aug 26 19:14:26 2018 +0300
@@ -824,7 +824,7 @@
$ hg merge -q bar --config ui.interactive=True << EOF
> c
> EOF
- file 'aa' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c
$ hg ci -m 'merge bar (with conflicts)'
--- a/tests/test-copy-move-merge.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-copy-move-merge.t Sun Aug 26 19:14:26 2018 +0300
@@ -88,7 +88,7 @@
> c
> EOF
rebasing 2:add3f11052fa "other" (tip)
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
--- a/tests/test-copytrace-heuristics.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-copytrace-heuristics.t Sun Aug 26 19:14:26 2018 +0300
@@ -86,7 +86,7 @@
$ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip)
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -243,7 +243,7 @@
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b "mod a" (tip)
skipping copytracing for 'a', more candidates than the limit: 7
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -699,7 +699,7 @@
$ hg rebase -s 8b6e13696 -d .
rebasing 1:8b6e13696c38 "added more things to a"
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-largefiles-update.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-largefiles-update.t Sun Aug 26 19:14:26 2018 +0300
@@ -611,7 +611,7 @@
> EOF
rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4"
- file '.hglf/large1' was deleted in local [dest] but was modified in other [source].
+ file '.hglf/large1' was deleted in other [source] but was modified in local [dest].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c
--- a/tests/test-merge-changedelete.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-changedelete.t Sun Aug 26 19:14:26 2018 +0300
@@ -54,10 +54,10 @@
Non-interactive merge:
$ hg merge -y
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging file3
@@ -123,10 +123,10 @@
> c
> d
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
merging file3
@@ -193,22 +193,22 @@
> baz
> c
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? foo
unrecognized response
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? bar
unrecognized response
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? d
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz
unrecognized response
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
merging file3
@@ -271,10 +271,10 @@
$ hg merge --config ui.interactive=true <<EOF
> d
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? d
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
merging file3
@@ -484,10 +484,10 @@
1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -545,10 +545,10 @@
1 other heads for branch "default"
$ hg merge --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u
@@ -604,10 +604,10 @@
1 other heads for branch "default"
$ hg merge --tool :merge3
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging file3
@@ -696,10 +696,10 @@
(status identical)
=== :other -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -726,10 +726,10 @@
(status identical)
=== :local -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -746,10 +746,10 @@
(status identical)
=== :fail -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -774,10 +774,10 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 -y
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -952,10 +952,10 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -1004,10 +1004,10 @@
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :merge3
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -1062,10 +1062,10 @@
(status identical)
=== :other -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
@@ -1091,10 +1091,10 @@
(status identical)
=== :local -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
@@ -1110,10 +1110,10 @@
(status identical)
=== :fail -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
--- a/tests/test-merge-force.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-force.t Sun Aug 26 19:14:26 2018 +0300
@@ -142,79 +142,79 @@
# 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
- file 'content1_missing_content1_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_content2_content1_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content1_content4-tracked
@@ -728,87 +728,87 @@
(no more unresolved files)
$ hg resolve --unmark --all
$ hg resolve --all --tool internal:merge3
- file 'content1_content2_content1_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content1_content4-tracked
- file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content1-tracked
- file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content4-tracked
- file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content1-tracked
- file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content3-tracked
- file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content4-tracked
- file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content1-tracked
- file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content4-tracked
- file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- file 'content1_missing_content1_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
merging missing_content2_content2_content4-tracked
--- a/tests/test-merge-remove.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-remove.t Sun Aug 26 19:14:26 2018 +0300
@@ -102,7 +102,7 @@
Those who use force will lose
$ hg merge -f
- file 'bar' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging foo1 and foo to foo1
--- a/tests/test-merge-subrepos.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-subrepos.t Sun Aug 26 19:14:26 2018 +0300
@@ -110,7 +110,7 @@
$ hg up -r '.^' --config ui.interactive=True << EOF
> d
> EOF
- file 'b' was deleted in other [destination] but was modified in local [working copy].
+ file 'b' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-newancestor.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-rebase-newancestor.t Sun Aug 26 19:14:26 2018 +0300
@@ -133,7 +133,7 @@
note: rebase of 1:1d1a643d390e created no changes to commit
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
- file 'f-default' was deleted in other [source] but was modified in local [dest].
+ file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
@@ -163,7 +163,7 @@
> EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
- file 'f-default' was deleted in other [source] but was modified in local [dest].
+ file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
--- a/tests/test-rename-merge2.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-rename-merge2.t Sun Aug 26 19:14:26 2018 +0300
@@ -692,7 +692,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)
- file 'a' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'a' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
b: both created -> m (premerge)
@@ -738,7 +738,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)
- file 'a' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'a' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
b: both created -> m (premerge)
--- a/tests/test-sparse-merges.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-sparse-merges.t Sun Aug 26 19:14:26 2018 +0300
@@ -113,7 +113,7 @@
$ hg merge
temporarily included 1 file(s) in the sparse checkout for merging
- file 'd' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'd' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved