Mercurial > public > mercurial-scm > hg
diff tests/test-merge-tools.t @ 27164:88d5db4b155c
filemerge: default regular prompts to 'leave unresolved' (BC)
It makes far more sense to leave these conflicts unresolved and kick back to
the user than to just assume that the local version be chosen. There are almost
certainly buggy scripts and applications using Mercurial in the wild that do
merges or rebases non-interactively, and then assume that if the operation
succeeded there's nothing the user needs to pay attention to.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 01 Dec 2015 09:48:38 -0800 |
| parents | 4ab69be0ea15 |
| children | 940c05b25b07 |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Mon Nov 30 13:43:55 2015 -0800 +++ b/tests/test-merge-tools.t Tue Dec 01 09:48:38 2015 -0800 @@ -532,9 +532,10 @@ # 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? l - 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + 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 @@ -542,7 +543,7 @@ # hg stat M f # hg resolve --list - R f + U f ui.merge specifies :prompt, with 'leave unresolved' chosen @@ -619,8 +620,8 @@ 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? l - (no more unresolved files) + keep (l)ocal, take (o)ther, or leave (u)nresolved? u + [1] $ aftermerge # cat f revision 1 @@ -629,7 +630,7 @@ M f ? f.orig # hg resolve --list - R f + U f ui.merge specifies internal:dump: