diff -r 71575a1e197e -r 975d959295ef tests/test-merge-changedelete.t --- a/tests/test-merge-changedelete.t Tue Aug 14 17:00:32 2018 +0000 +++ b/tests/test-merge-changedelete.t Sat Aug 25 21:17:34 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 local [working copy] but was modified in other [merge rev]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 other [merge rev] but was modified in local [working copy]. 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 < d > EOF - file file1 was deleted in local [working copy] but was modified in other [merge rev]. + file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [merge rev]. 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 other [merge rev] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. 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 local [working copy] but was modified in other [destination]. 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 other [destination] but was modified in local [working copy]. What do you want to do? use (c)hanged version, leave (d)eleted, or leave (u)nresolved? --- diff of status ---