[PATCH 1 of 5 mergedriver] simplemerge: move conflict warning message to filemerge
Siddharth Agarwal
sid0 at fb.com
Fri Oct 9 23:10:20 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1444424092 25200
# Fri Oct 09 13:54:52 2015 -0700
# Node ID ef1c9fd840c5e750e83cf65873ac8217a5119ab1
# Parent b9680b02e1d11a2b0888f17c627cf6e127e38205
simplemerge: move conflict warning message to filemerge
The current output for a failed merge with conflict markers looks something like:
merging foo
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
merging bar
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
We're going to change the way merges are done to perform all premerges before
all merges, so that the output above would look like:
merging foo
merging bar
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
The 'warning: conflicts during merge' line has no context, so is pretty
confusing.
This patch will change the future output to:
merging foo
merging bar
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
that is tricky because we already hint that people run 'hg resolve' to retry
unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
based resolution.
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -255,8 +255,8 @@ def _merge(repo, mynode, orig, fcd, fco,
return True, r
@internaltool('union', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""
@@ -267,8 +267,8 @@ def _iunion(repo, mynode, orig, fcd, fco
files, labels, 'union')
@internaltool('merge', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""
@@ -280,8 +280,8 @@ def _imerge(repo, mynode, orig, fcd, fco
files, labels, 'merge')
@internaltool('merge3', fullmerge,
- _("merging %s incomplete! "
- "(edit conflicts, then use 'hg resolve --mark')\n"),
+ _("warning: conflicts while merging %s! "
+ "(edit, then use 'hg resolve --mark')\n"),
precheck=_symlinkcheck)
def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
"""
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -413,6 +413,4 @@ def simplemerge(ui, local, base, other,
out.close()
if m3.conflicts and not mode == 'union':
- if not opts.get('quiet'):
- ui.warn(_("warning: conflicts during merge.\n"))
return 1
diff --git a/tests/test-add.t b/tests/test-add.t
--- a/tests/test-add.t
+++ b/tests/test-add.t
@@ -97,8 +97,7 @@ should fail
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -79,8 +79,7 @@ aborted rebase should restore active boo
$ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (tip three)
merging d
- warning: conflicts during merge.
- merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort
@@ -95,8 +94,7 @@ after aborted rebase, restoring a bookma
$ hg rebase -s three -d two
rebasing 4:dd7c838e8362 "4" (tip three)
merging d
- warning: conflicts during merge.
- merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg bookmark -d three
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -627,8 +627,7 @@ Amend a merge changeset (with renames an
$ hg add cc
$ hg ci -m aa
$ hg merge -q bar
- warning: conflicts during merge.
- merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
[1]
$ hg resolve -m cc
(no more unresolved files)
diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t
+++ b/tests/test-commit-unresolved.t
@@ -25,8 +25,7 @@ Merging a conflict araises
$ hg merge
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, 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]
diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -36,8 +36,7 @@
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -73,8 +72,7 @@ Verify custom conflict markers
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -105,8 +103,7 @@ Verify line splitting of custom conflict
> EOF
$ hg -q merge 1
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
@@ -148,8 +145,7 @@ Verify line trimming of custom conflict
> EOF
$ hg -q --encoding utf-8 merge 1
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
@@ -176,8 +172,7 @@ Verify basic conflict markers
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -205,8 +200,7 @@ internal:merge3
$ hg merge 1 --tool internal:merge3
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -251,8 +245,7 @@ Now test :merge-other and :merge-local
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -153,7 +153,6 @@ conflicts
other
end
>>>>>>> conflict-other
- warning: conflicts during merge.
[1]
1 label
@@ -167,7 +166,6 @@ 1 label
other
end
>>>>>>> conflict-other
- warning: conflicts during merge.
[1]
2 labels
@@ -181,7 +179,6 @@ 2 labels
other
end
>>>>>>> bar
- warning: conflicts during merge.
[1]
3 labels
@@ -196,7 +193,6 @@ 3 labels
other
end
>>>>>>> bar
- warning: conflicts during merge.
[1]
too many labels
diff --git a/tests/test-convert-svn-sink.t b/tests/test-convert-svn-sink.t
--- a/tests/test-convert-svn-sink.t
+++ b/tests/test-convert-svn-sink.t
@@ -382,8 +382,7 @@ Branchy history
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg --cwd b merge
merging b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, 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]
diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -162,9 +162,8 @@ Test merge states
$ fileset 'unresolved()'
$ hg merge
merging b2
- warning: conflicts during merge.
- merging b2 incomplete! (edit conflicts, then use 'hg resolve --mark')
- * files updated, 0 files merged, * files removed, 1 files unresolved (glob)
+ warning: conflicts while merging b2! (edit, then use 'hg resolve --mark')
+ 6 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
$ fileset 'resolved()'
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -187,8 +187,7 @@ Graft out of order, skipping a merge and
picked tool ':merge' for e (binary False symlink False)
merging e
my e at 1905859650ec+ other e at 9c233e8e184d ancestor e at 68795b066622
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use hg resolve and hg graft --continue)
[255]
@@ -220,8 +219,7 @@ Graft again:
skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
grafting 4:9c233e8e184d "4"
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use hg resolve and hg graft --continue)
[255]
@@ -421,8 +419,7 @@ Resolve conflicted graft
[255]
$ hg resolve --all
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
<<<<<<< local: aaa4406d4f0a - test: 9
@@ -747,8 +744,7 @@ graft --continue after --force
[255]
$ hg resolve --all
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ echo abc > a
$ hg resolve -m a
diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t
+++ b/tests/test-histedit-fold-non-commute.t
@@ -88,8 +88,7 @@ edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
fix up
@@ -123,8 +122,7 @@ fix up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
just continue this time
@@ -253,8 +251,7 @@ edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
fix up
@@ -266,8 +263,7 @@ fix up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
just continue this time
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -296,8 +296,7 @@ folded content is dropped during a merge
> EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file
- warning: conflicts during merge.
- merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
[1]
There were conflicts, we keep P1 content. This
@@ -358,8 +357,7 @@ dropped revision.
> EOF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file
- warning: conflicts during merge.
- merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
[1]
$ cat > file << EOF
diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t
--- a/tests/test-histedit-non-commute-abort.t
+++ b/tests/test-histedit-non-commute-abort.t
@@ -72,8 +72,7 @@ edit the history
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t
+++ b/tests/test-histedit-non-commute.t
@@ -89,8 +89,7 @@ edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
abort the edit
@@ -147,8 +146,7 @@ edit the history
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
fix up
@@ -158,8 +156,7 @@ fix up
$ hg histedit --continue 2>&1 | fixbundle
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative
@@ -236,8 +233,7 @@ edit the history, this time with a fold
$ hg histedit 3 --commands $EDITED 2>&1 | fixbundle
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
$ echo 'I can haz no commute' > e
@@ -246,8 +242,7 @@ edit the history, this time with a fold
$ hg histedit --continue 2>&1 | fixbundle
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging e
- warning: conflicts during merge.
- merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change and run hg histedit --continue
second edit also fails, but just continue
$ hg revert -r 'p1()' e
diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t
--- a/tests/test-issue1175.t
+++ b/tests/test-issue1175.t
@@ -70,8 +70,7 @@ http://bz.selenic.com/show_bug.cgi?id=44
$ hg graft 1
grafting 1:5974126fad84 "b1"
merging b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use hg resolve and hg graft --continue)
[255]
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1070,8 +1070,7 @@ conflict: keyword should stay outside co
created new head
$ hg merge
merging m
- warning: conflicts during merge.
- merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging m! (edit, 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]
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -127,8 +127,7 @@ Test that "hg merge" updates largefiles
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
merging normal1
- warning: conflicts during merge.
- merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
getting changed largefiles
1 largefiles updated, 0 removed
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
@@ -555,8 +554,7 @@ it is aborted by conflict.
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
merging normal1
- warning: conflicts during merge.
- merging normal1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ cat .hglf/large1
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -125,7 +125,7 @@ add some changesets to rename/remove/mer
$ 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 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging stuff/maybelarge.dat! (edit, 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
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -1273,8 +1273,7 @@ log -p -R repo
created new head
$ hg merge 7
merging foo
- warning: conflicts during merge.
- merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging foo! (edit, 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]
@@ -1285,8 +1284,7 @@ log -p -R repo
$ hg merge 4
merging foo
- warning: conflicts during merge.
- merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging foo! (edit, 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]
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -192,38 +192,28 @@ Merge with remote
remote changed content1_content2_missing_missing-untracked which local deleted
use (c)hanged version or leave (d)eleted? c
merging content1_content2_content1_content4-tracked
- warning: conflicts during merge.
- merging content1_content2_content1_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content2_content1-tracked
merging content1_content2_content2_content4-tracked
- warning: conflicts during merge.
- merging content1_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content1-tracked
merging content1_content2_content3_content3-tracked
- warning: conflicts during merge.
- merging content1_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_content3_content4-tracked
- warning: conflicts during merge.
- merging content1_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging content1_content2_missing_content1-tracked
merging content1_content2_missing_content4-tracked
- warning: conflicts during merge.
- merging content1_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content2_content4-tracked
- warning: conflicts during merge.
- merging missing_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content3-tracked
- warning: conflicts during merge.
- merging missing_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_content3_content4-tracked
- warning: conflicts during merge.
- merging missing_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-tracked
- warning: conflicts during merge.
- merging missing_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
merging missing_content2_missing_content4-untracked
- warning: conflicts during merge.
- merging missing_content2_missing_content4-untracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
39 files updated, 3 files merged, 8 files removed, 10 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
diff --git a/tests/test-merge-local.t b/tests/test-merge-local.t
--- a/tests/test-merge-local.t
+++ b/tests/test-merge-local.t
@@ -62,8 +62,7 @@ Local merge with bad merge tool:
$ hg co 0
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, 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]
@@ -87,8 +86,7 @@ Local merge with conflicts:
$ hg co
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, 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]
@@ -96,8 +94,7 @@ Local merge with conflicts:
$ hg co 0
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, 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]
diff --git a/tests/test-merge-revert2.t b/tests/test-merge-revert2.t
--- a/tests/test-merge-revert2.t
+++ b/tests/test-merge-revert2.t
@@ -44,8 +44,7 @@
$ hg update
merging file1
- warning: conflicts during merge.
- merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging file1! (edit, 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]
diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -67,8 +67,7 @@ running from a devel copy, not a temp in
$ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -113,8 +112,7 @@ unexecutable file in $PATH shouldn't be
$ hg up -qC 1
$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -128,8 +126,7 @@ executable directory in $PATH shouldn't
$ hg up -qC 1
$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -1022,7 +1019,7 @@ internal merge cannot handle symlinks an
$ hg merge -r 2 --tool internal:merge
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -40,7 +40,7 @@ Symlink is local parent, executable is o
merging a
my a at 521a1e40188f+ other a at 3574f3e69b1c ancestor a at c334dc3be0da
warning: internal :merge cannot merge symlinks for a
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -73,7 +73,7 @@ Symlink is other parent, executable is l
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
warning: internal :union cannot merge symlinks for a
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -96,7 +96,7 @@ Symlink is other parent, executable is l
merging a
my a at 3574f3e69b1c+ other a at 521a1e40188f ancestor a at c334dc3be0da
warning: internal :merge3 cannot merge symlinks for a
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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]
@@ -159,7 +159,7 @@ where that was what happened.
$ hg merge
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -171,7 +171,7 @@ where that was what happened.
$ hg merge
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -198,7 +198,7 @@ Test removed 'x' flag merged with change
$ hg merge
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -210,7 +210,7 @@ Test removed 'x' flag merged with change
$ hg merge
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, 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]
@@ -283,22 +283,20 @@ h: l vs l, different
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for b
merging b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for c
merging d
warning: internal :merge cannot merge symlinks for d
- merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
merging h
warning: internal :merge cannot merge symlinks for h
- merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 5 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
@@ -344,22 +342,20 @@ h: l vs l, different
$ hg up -Cqr1
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for b
merging b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
warning: cannot merge flags for c
merging d
warning: internal :merge cannot merge symlinks for d
- merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
merging f
warning: internal :merge cannot merge symlinks for f
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
merging h
warning: internal :merge cannot merge symlinks for h
- merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 5 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -44,8 +44,7 @@ now pull and merge from test-a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
merging test.txt
- warning: conflicts during merge.
- merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging test.txt! (edit, 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]
@@ -89,8 +88,7 @@ pull and merge from test-a again
picked tool ':merge' for test.txt (binary False symlink False)
merging test.txt
my test.txt at 50c3a7e29886+ other test.txt at 40d11a4173a8 ancestor test.txt at 96b70246a118
- warning: conflicts during merge.
- merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging test.txt! (edit, 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]
diff --git a/tests/test-merge9.t b/tests/test-merge9.t
--- a/tests/test-merge9.t
+++ b/tests/test-merge9.t
@@ -83,8 +83,7 @@ resolve all warning
resolve all
$ hg resolve -a
merging bar
- warning: conflicts during merge.
- merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
[1]
after
diff --git a/tests/test-mq-qnew.t b/tests/test-mq-qnew.t
--- a/tests/test-mq-qnew.t
+++ b/tests/test-mq-qnew.t
@@ -156,8 +156,7 @@ plain headers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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
(no more unresolved files)
@@ -234,8 +233,7 @@ hg headers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, 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
(no more unresolved files)
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -64,8 +64,7 @@ Conflicting rebase:
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
- warning: conflicts during merge.
- merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -94,8 +93,7 @@ earlier than 2.7 by renaming ".hg/rebase
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
- warning: conflicts during merge.
- merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -165,8 +163,7 @@ Rebase and abort without generating new
note: rebase of 3:a6484957d6b9 created no changes to commit
rebasing 4:145842775fec "C1" (tip)
merging c
- warning: conflicts during merge.
- merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -225,8 +222,7 @@ rebase abort should not leave working co
$ hg rebase -d master -r foo
rebasing 3:6c0f977a22d8 "C" (tip foo)
merging c
- warning: conflicts during merge.
- merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg rebase --abort
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -170,8 +170,7 @@ rebase --continue with bookmarks present
$ hg rebase
rebasing 3:3d5fa227f4b5 "C" (Y Z)
merging c
- warning: conflicts during merge.
- merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ echo 'c' > c
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -68,8 +68,7 @@ Rebasing B onto E - check keep: and phas
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -125,8 +124,7 @@ Rebase F onto E - check keepbranches:
$ hg rebase -s 5 -d 4 --keepbranches
rebasing 5:01e6ebbd8272 "F" (tip)
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -64,8 +64,7 @@ Conflicting rebase:
rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2"
merging common
- warning: conflicts during merge.
- merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -391,8 +391,7 @@ Ensure --continue restores a correct sta
$ hg rebase -s 8 -d 7 --config ui.merge=internal:fail
rebasing 8:6215fafa5447 "H2" (tip)
merging H
- warning: conflicts during merge.
- merging H incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging H! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg resolve --all -t internal:local
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -60,8 +60,7 @@ Rebasing B onto E:
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -98,8 +97,7 @@ Resume the rebasing:
already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -157,8 +155,7 @@ Rebasing B onto E:
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -230,8 +227,7 @@ Rebasing B onto E:
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
- warning: conflicts during merge.
- merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -61,8 +61,7 @@ Rebase - generate a conflict:
$ hg rebase -s 2 -d 1
rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
@@ -75,8 +74,7 @@ Fix the 1st conflict:
rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -131,8 +131,7 @@ and committed in local target directory.
$ hg commit -qm 'new file in target directory'
$ hg merge 2
merging b/c and a/c to b/c
- warning: conflicts during merge.
- merging b/c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b/c! (edit, 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]
@@ -162,8 +161,7 @@ and committed in local source directory.
C a/c
$ hg merge 5
merging a/c and b/c to b/c
- warning: conflicts during merge.
- merging b/c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b/c! (edit, then use 'hg resolve --mark')
2 files updated, 0 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -134,10 +134,8 @@ resolve without arguments should suggest
resolve --all should re-merge all unresolved files
$ hg resolve -q --all
- warning: conflicts during merge.
- merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
- warning: conflicts during merge.
- merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+ warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
[1]
$ grep '<<<' file1 > /dev/null
$ grep '<<<' file2 > /dev/null
@@ -145,8 +143,7 @@ resolve --all should re-merge all unreso
resolve <file> should re-merge file
$ echo resolved > file1
$ hg resolve -q file1
- warning: conflicts during merge.
- merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
[1]
$ grep '<<<' file1 > /dev/null
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -301,8 +301,7 @@ force a conflicted merge to occur
rebasing shelved changes
rebasing 5:4702e8911fe0 "changes to '[mq]: second.patch'" (tip)
merging a/a
- warning: conflicts during merge.
- merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
@@ -382,8 +381,7 @@ try to continue with no unshelve underwa
redo the unshelve to get a conflict
$ hg unshelve -q
- warning: conflicts during merge.
- merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
@@ -707,8 +705,7 @@ unshelve and conflicts with tracked and
rebasing shelved changes
rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ hg log -G --template '{rev} {desc|firstline} {author} {date|isodate}'
@@ -763,8 +760,7 @@ unshelve and conflicts with tracked and
rebasing shelved changes
rebasing 5:23b29cada8ba "changes to 'commit stuff'" (tip)
merging f
- warning: conflicts during merge.
- merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ hg st
@@ -807,8 +803,7 @@ Recreate some conflict again
rebasing shelved changes
rebasing 5:4b555fdb4e96 "changes to 'second'" (tip)
merging a/a
- warning: conflicts during merge.
- merging a/a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ hg bookmark
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -325,11 +325,9 @@ test 'resolve -l'
created new head
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
merging b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, 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]
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -300,8 +300,7 @@ merge tests
picked tool ':merge' for t (binary False symlink False)
merging t
my t at 20a0db6fbf6c+ other t at 7af322bc1198 ancestor t at 6747d179aa9a
- warning: conflicts during merge.
- merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging t! (edit, 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
subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
diff --git a/tests/test-update-renames.t b/tests/test-update-renames.t
--- a/tests/test-update-renames.t
+++ b/tests/test-update-renames.t
@@ -20,8 +20,7 @@ Update with local changes across a file
$ hg up
merging a and b to b
- warning: conflicts during merge.
- merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging b! (edit, 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]
More information about the Mercurial-devel
mailing list