Mercurial > public > mercurial-scm > hg

diff tests/test-merge-tools.t @ 27162:4ab69be0ea15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 11:17:18 -0800
parents 7a8e9a985c3b
children 88d5db4b155c
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Wed Nov 25 14:25:26 2015 -0800
+++ b/tests/test-merge-tools.t	Mon Nov 30 11:17:18 2015 -0800
@@ -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 or take (o)ther? l
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ aftermerge
@@ -544,6 +544,31 @@
   # hg resolve --list
   R f
 
+ui.merge specifies :prompt, with 'leave unresolved' chosen
+
+  $ beforemerge
+  [merge-tools]
+  false.whatever=
+  true.priority=1
+  true.executable=cat
+  # hg update -C 1
+  $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
+  > u
+  > EOF
+  no tool found to merge f
+  keep (l)ocal, take (o)ther, 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]
+  $ aftermerge
+  # cat f
+  revision 1
+  space
+  # hg stat
+  M f
+  # hg resolve --list
+  U f
+
 prompt with EOF
 
   $ beforemerge
@@ -554,7 +579,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 or take (o)ther? 
+  keep (l)ocal, take (o)ther, 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]
@@ -568,7 +593,7 @@
   U f
   $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   [1]
   $ aftermerge
   # cat f
@@ -582,7 +607,7 @@
   $ rm f
   $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
   no tool found to merge f
-  keep (l)ocal or take (o)ther? 
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? 
   [1]
   $ aftermerge
   # cat f
@@ -594,7 +619,7 @@
   U f
   $ hg resolve --all --config ui.merge=internal:prompt
   no tool found to merge f
-  keep (l)ocal or take (o)ther? l
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
   (no more unresolved files)
   $ aftermerge
   # cat f