Mercurial > hg
diff tests/test-contrib.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 | c63a09b6b337 |
children | c3e9269d9602 |
line wrap: on
line diff
--- 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