Mercurial > hg-stable
changeset 26614:ef1eb6df7071
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.
line wrap: on
line diff
--- a/mercurial/filemerge.py Sun Oct 11 15:04:00 2015 -0700 +++ b/mercurial/filemerge.py Fri Oct 09 13:54:52 2015 -0700 @@ -255,8 +255,8 @@ 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 @@ 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 @@ 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): """
--- a/mercurial/simplemerge.py Sun Oct 11 15:04:00 2015 -0700 +++ b/mercurial/simplemerge.py Fri Oct 09 13:54:52 2015 -0700 @@ -414,6 +414,4 @@ out.close() if m3.conflicts and not mode == 'union': - if not opts.get('quiet'): - ui.warn(_("warning: conflicts during merge.\n")) return 1
--- a/tests/test-add.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-add.t Fri Oct 09 13:54:52 2015 -0700 @@ -97,8 +97,7 @@ $ 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]
--- a/tests/test-bookmarks-rebase.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-bookmarks-rebase.t Fri Oct 09 13:54:52 2015 -0700 @@ -79,8 +79,7 @@ $ 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 @@ $ 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
--- a/tests/test-commit-amend.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-commit-amend.t Fri Oct 09 13:54:52 2015 -0700 @@ -627,8 +627,7 @@ $ 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)
--- a/tests/test-commit-unresolved.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-commit-unresolved.t Fri Oct 09 13:54:52 2015 -0700 @@ -25,8 +25,7 @@ $ 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]
--- a/tests/test-conflict.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-conflict.t Fri Oct 09 13:54:52 2015 -0700 @@ -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 @@ $ 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 @@ > 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 @@ > 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 @@ $ 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 @@ $ 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 @@ $ 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]
--- a/tests/test-contrib.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-contrib.t Fri Oct 09 13:54:52 2015 -0700 @@ -153,7 +153,6 @@ other end >>>>>>> conflict-other - warning: conflicts during merge. [1] 1 label @@ -167,7 +166,6 @@ other end >>>>>>> conflict-other - warning: conflicts during merge. [1] 2 labels @@ -181,7 +179,6 @@ other end >>>>>>> bar - warning: conflicts during merge. [1] 3 labels @@ -196,7 +193,6 @@ other end >>>>>>> bar - warning: conflicts during merge. [1] too many labels
--- a/tests/test-convert-svn-sink.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-convert-svn-sink.t Fri Oct 09 13:54:52 2015 -0700 @@ -382,8 +382,7 @@ 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]
--- a/tests/test-fileset.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-fileset.t Fri Oct 09 13:54:52 2015 -0700 @@ -162,9 +162,8 @@ $ 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()'
--- a/tests/test-graft.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-graft.t Fri Oct 09 13:54:52 2015 -0700 @@ -189,8 +189,7 @@ my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 picked tool ':merge' for e (binary False symlink False) my e@1905859650ec+ other e@9c233e8e184d ancestor e@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] @@ -222,8 +221,7 @@ 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] @@ -423,8 +421,7 @@ [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 @@ -749,8 +746,7 @@ [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
--- a/tests/test-histedit-fold-non-commute.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-histedit-fold-non-commute.t Fri Oct 09 13:54:52 2015 -0700 @@ -88,8 +88,7 @@ $ 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 @@ 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 @@ $ 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 @@ 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
--- a/tests/test-histedit-fold.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-histedit-fold.t Fri Oct 09 13:54:52 2015 -0700 @@ -296,8 +296,7 @@ > 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 @@ > 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
--- a/tests/test-histedit-non-commute-abort.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-histedit-non-commute-abort.t Fri Oct 09 13:54:52 2015 -0700 @@ -72,8 +72,7 @@ 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
--- a/tests/test-histedit-non-commute.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-histedit-non-commute.t Fri Oct 09 13:54:52 2015 -0700 @@ -89,8 +89,7 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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
--- a/tests/test-issue1175.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-issue1175.t Fri Oct 09 13:54:52 2015 -0700 @@ -70,8 +70,7 @@ $ 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]
--- a/tests/test-keyword.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-keyword.t Fri Oct 09 13:54:52 2015 -0700 @@ -1070,8 +1070,7 @@ 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]
--- a/tests/test-largefiles-update.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-largefiles-update.t Fri Oct 09 13:54:52 2015 -0700 @@ -127,8 +127,7 @@ 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 @@ 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
--- a/tests/test-lfconvert.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-lfconvert.t Fri Oct 09 13:54:52 2015 -0700 @@ -125,7 +125,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 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
--- a/tests/test-log.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-log.t Fri Oct 09 13:54:52 2015 -0700 @@ -1273,8 +1273,7 @@ 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 @@ $ 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]
--- a/tests/test-merge-force.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge-force.t Fri Oct 09 13:54:52 2015 -0700 @@ -192,38 +192,28 @@ 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]
--- a/tests/test-merge-local.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge-local.t Fri Oct 09 13:54:52 2015 -0700 @@ -62,8 +62,7 @@ $ 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 @@ $ 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 @@ $ 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]
--- a/tests/test-merge-revert2.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge-revert2.t Fri Oct 09 13:54:52 2015 -0700 @@ -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]
--- a/tests/test-merge-tools.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge-tools.t Fri Oct 09 13:54:52 2015 -0700 @@ -67,8 +67,7 @@ $ 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 @@ $ 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 @@ $ 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] @@ -1024,7 +1021,7 @@ $ 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]
--- a/tests/test-merge-types.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge-types.t Fri Oct 09 13:54:52 2015 -0700 @@ -40,7 +40,7 @@ merging a my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@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 @@ merging a my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@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 @@ merging a my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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]
--- a/tests/test-merge7.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge7.t Fri Oct 09 13:54:52 2015 -0700 @@ -44,8 +44,7 @@ (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] @@ -91,8 +90,7 @@ my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 picked tool ':merge' for test.txt (binary False symlink False) my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@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]
--- a/tests/test-merge9.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-merge9.t Fri Oct 09 13:54:52 2015 -0700 @@ -83,8 +83,7 @@ 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
--- a/tests/test-mq-qnew.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-mq-qnew.t Fri Oct 09 13:54:52 2015 -0700 @@ -156,8 +156,7 @@ 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 @@ 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)
--- a/tests/test-rebase-abort.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-abort.t Fri Oct 09 13:54:52 2015 -0700 @@ -64,8 +64,7 @@ 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 @@ 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 @@ 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 @@ $ 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
--- a/tests/test-rebase-bookmarks.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-bookmarks.t Fri Oct 09 13:54:52 2015 -0700 @@ -170,8 +170,7 @@ $ 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
--- a/tests/test-rebase-check-restore.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-check-restore.t Fri Oct 09 13:54:52 2015 -0700 @@ -68,8 +68,7 @@ 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 @@ $ 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]
--- a/tests/test-rebase-conflicts.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-conflicts.t Fri Oct 09 13:54:52 2015 -0700 @@ -64,8 +64,7 @@ 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]
--- a/tests/test-rebase-detach.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-detach.t Fri Oct 09 13:54:52 2015 -0700 @@ -391,8 +391,7 @@ $ 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
--- a/tests/test-rebase-interruptions.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-interruptions.t Fri Oct 09 13:54:52 2015 -0700 @@ -60,8 +60,7 @@ 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 @@ 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 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 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]
--- a/tests/test-rebase-mq.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rebase-mq.t Fri Oct 09 13:54:52 2015 -0700 @@ -61,8 +61,7 @@ $ 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 @@ 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]
--- a/tests/test-rename-dir-merge.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-rename-dir-merge.t Fri Oct 09 13:54:52 2015 -0700 @@ -131,8 +131,7 @@ $ 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 @@ 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]
--- a/tests/test-resolve.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-resolve.t Fri Oct 09 13:54:52 2015 -0700 @@ -134,10 +134,8 @@ 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 <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
--- a/tests/test-shelve.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-shelve.t Fri Oct 09 13:54:52 2015 -0700 @@ -301,8 +301,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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
--- a/tests/test-status-color.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-status-color.t Fri Oct 09 13:54:52 2015 -0700 @@ -325,11 +325,9 @@ 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]
--- a/tests/test-subrepo.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-subrepo.t Fri Oct 09 13:54:52 2015 -0700 @@ -302,8 +302,7 @@ my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a picked tool ':merge' for t (binary False symlink False) my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@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
--- a/tests/test-update-renames.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-update-renames.t Fri Oct 09 13:54:52 2015 -0700 @@ -20,8 +20,7 @@ $ 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]