Mercurial > hg
comparison tests/test-issue1175.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 | 2fc86d92c4a9 |
children | cdb9493a7e2f |
comparison
equal
deleted
inserted
replaced
26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
---|---|
68 $ echo b2 >> b | 68 $ echo b2 >> b |
69 $ hg ci -Aqm b2 | 69 $ hg ci -Aqm b2 |
70 $ hg graft 1 | 70 $ hg graft 1 |
71 grafting 1:5974126fad84 "b1" | 71 grafting 1:5974126fad84 "b1" |
72 merging b | 72 merging b |
73 warning: conflicts during merge. | 73 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
74 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') | |
75 abort: unresolved conflicts, can't continue | 74 abort: unresolved conflicts, can't continue |
76 (use hg resolve and hg graft --continue) | 75 (use hg resolve and hg graft --continue) |
77 [255] | 76 [255] |
78 $ echo a > b | 77 $ echo a > b |
79 $ echo b3 >> b | 78 $ echo b3 >> b |