Mercurial > hg
diff tests/test-rebase-abort.t @ 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.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 09 Oct 2015 13:54:52 -0700 |
parents | 6084926366b9 |
children | e9b3d523f2e6 |
line wrap: on
line diff
--- 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