Mercurial > hg

comparison tests/test-commit-unresolved.t @ 26614:ef1eb6df7071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3cbb5bf4035d
children f97bb61b51e6
comparison
equal deleted inserted replaced
26613:abb5ec3eb6ce 26614:ef1eb6df7071
23 23
24 Merging a conflict araises 24 Merging a conflict araises
25 25
26 $ hg merge 26 $ hg merge
27 merging A 27 merging A
28 warning: conflicts during merge. 28 warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
29 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
30 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 29 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
31 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 30 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
32 [1] 31 [1]
33 32
34 Correct the conflict without marking the file as resolved 33 Correct the conflict without marking the file as resolved