--- a/mercurial/filemerge.py Sat Nov 12 02:08:01 2011 +0100
+++ b/mercurial/filemerge.py Wed Nov 16 18:04:19 2011 -0600
@@ -262,7 +262,11 @@
_matcheol(repo.wjoin(fd), back)
if r:
- ui.warn(_("merging %s failed!\n") % fd)
+ if tool == "internal:merge":
+ ui.warn(_("merging %s incomplete! "
+ "(edit conflicts, then use 'hg resolve --mark')\n") % fd)
+ else:
+ ui.warn(_("merging %s failed!\n") % fd)
else:
os.unlink(back)
--- a/tests/test-add.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-add.t Wed Nov 16 18:04:19 2011 -0600
@@ -88,7 +88,7 @@
$ hg merge
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
--- a/tests/test-commit-unresolved.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-commit-unresolved.t Wed Nov 16 18:04:19 2011 -0600
@@ -29,7 +29,7 @@
$ hg merge
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
1 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]
--- a/tests/test-conflict.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-conflict.t Wed Nov 16 18:04:19 2011 -0600
@@ -13,7 +13,7 @@
$ hg merge 1
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
--- a/tests/test-convert-svn-sink.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-convert-svn-sink.t Wed Nov 16 18:04:19 2011 -0600
@@ -416,7 +416,7 @@
$ hg --cwd b merge
merging b
warning: conflicts during merge.
- merging b failed!
+ merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
2 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]
--- a/tests/test-graft.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-graft.t Wed Nov 16 18:04:19 2011 -0600
@@ -151,7 +151,7 @@
merging e
my e@77eb504366ab+ other e@9c233e8e184d ancestor e@68795b066622
warning: conflicts during merge.
- merging e failed!
+ merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
searching for copies back to rev 1
unmatched files in local:
c
--- a/tests/test-keyword.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-keyword.t Wed Nov 16 18:04:19 2011 -0600
@@ -976,7 +976,7 @@
$ hg merge
merging m
warning: conflicts during merge.
- merging m failed!
+ merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
--- a/tests/test-lfconvert.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-lfconvert.t Wed Nov 16 18:04:19 2011 -0600
@@ -84,7 +84,7 @@
$ hg merge
merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
- merging stuff/maybelarge.dat failed!
+ merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
merging sub/normal2 and stuff/normal2 to stuff/normal2
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
--- a/tests/test-log.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-log.t Wed Nov 16 18:04:19 2011 -0600
@@ -922,7 +922,7 @@
$ hg merge 7
merging foo
warning: conflicts during merge.
- merging foo failed!
+ merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
@@ -933,7 +933,7 @@
$ hg merge 4
merging foo
warning: conflicts during merge.
- merging foo failed!
+ merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
1 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]
--- a/tests/test-merge-local.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge-local.t Wed Nov 16 18:04:19 2011 -0600
@@ -63,7 +63,7 @@
merging zzz1_merge_ok
merging zzz2_merge_bad
warning: conflicts during merge.
- merging zzz2_merge_bad failed!
+ merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
@@ -88,7 +88,7 @@
merging zzz1_merge_ok
merging zzz2_merge_bad
warning: conflicts during merge.
- merging zzz2_merge_bad failed!
+ merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
@@ -97,7 +97,7 @@
merging zzz1_merge_ok
merging zzz2_merge_bad
warning: conflicts during merge.
- merging zzz2_merge_bad failed!
+ merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
--- a/tests/test-merge-revert2.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge-revert2.t Wed Nov 16 18:04:19 2011 -0600
@@ -45,7 +45,7 @@
$ hg update
merging file1
warning: conflicts during merge.
- merging file1 failed!
+ merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
--- a/tests/test-merge-tools.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge-tools.t Wed Nov 16 18:04:19 2011 -0600
@@ -66,7 +66,7 @@
$ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
merging f
warning: conflicts during merge.
- merging f failed!
+ merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
--- a/tests/test-merge7.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge7.t Wed Nov 16 18:04:19 2011 -0600
@@ -45,7 +45,7 @@
$ hg merge
merging test.txt
warning: conflicts during merge.
- merging test.txt failed!
+ merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
@@ -90,7 +90,7 @@
merging test.txt
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
warning: conflicts during merge.
- merging test.txt failed!
+ merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
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]
--- a/tests/test-merge9.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-merge9.t Wed Nov 16 18:04:19 2011 -0600
@@ -83,7 +83,7 @@
$ hg resolve -a
merging bar
warning: conflicts during merge.
- merging bar failed!
+ merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
[1]
after
--- a/tests/test-mq-qnew.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-mq-qnew.t Wed Nov 16 18:04:19 2011 -0600
@@ -155,7 +155,7 @@
created new head
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
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
abort: cannot manage merge changesets
@@ -228,7 +228,7 @@
created new head
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
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
abort: cannot manage merge changesets
--- a/tests/test-rebase-abort.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-abort.t Wed Nov 16 18:04:19 2011 -0600
@@ -49,7 +49,7 @@
$ hg rebase -s 3 -d 2
merging common
warning: conflicts during merge.
- merging common failed!
+ merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
@@ -117,7 +117,7 @@
$ hg rebase -b 4 -d 2
merging c
warning: conflicts during merge.
- merging c failed!
+ merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
--- a/tests/test-rebase-check-restore.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-check-restore.t Wed Nov 16 18:04:19 2011 -0600
@@ -63,7 +63,7 @@
$ hg rebase -s 1 -d 4 --keep
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
@@ -115,7 +115,7 @@
$ hg rebase -s 5 -d 4 --keepbranches
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
--- a/tests/test-rebase-conflicts.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-conflicts.t Wed Nov 16 18:04:19 2011 -0600
@@ -58,7 +58,7 @@
$ hg rebase -s 3 -d 2
merging common
warning: conflicts during merge.
- merging common failed!
+ merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
--- a/tests/test-rebase-detach.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-detach.t Wed Nov 16 18:04:19 2011 -0600
@@ -367,7 +367,7 @@
$ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail
merging H
warning: conflicts during merge.
- merging H failed!
+ merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
$ hg resolve --all -t internal:local
--- a/tests/test-rebase-interruptions.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-interruptions.t Wed Nov 16 18:04:19 2011 -0600
@@ -56,7 +56,7 @@
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
@@ -88,7 +88,7 @@
$ hg rebase --continue
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
@@ -142,7 +142,7 @@
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
- merging A failed!
+ merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
--- a/tests/test-rebase-mq.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-rebase-mq.t Wed Nov 16 18:04:19 2011 -0600
@@ -62,7 +62,7 @@
$ hg rebase -s 2 -d 1
merging f
warning: conflicts during merge.
- merging f failed!
+ merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
@@ -73,7 +73,7 @@
$ hg rebase -c
merging f
warning: conflicts during merge.
- merging f failed!
+ merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
--- a/tests/test-status-color.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-status-color.t Wed Nov 16 18:04:19 2011 -0600
@@ -280,10 +280,10 @@
$ hg merge
merging a
warning: conflicts during merge.
- merging a failed!
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
merging b
warning: conflicts during merge.
- merging b failed!
+ merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
--- a/tests/test-subrepo.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-subrepo.t Wed Nov 16 18:04:19 2011 -0600
@@ -245,7 +245,7 @@
merging t
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
warning: conflicts during merge.
- merging t failed!
+ merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-update-renames.t Sat Nov 12 02:08:01 2011 +0100
+++ b/tests/test-update-renames.t Wed Nov 16 18:04:19 2011 -0600
@@ -21,7 +21,7 @@
$ hg up
merging a and b to b
warning: conflicts during merge.
- merging b failed!
+ merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]