Mercurial > hg

comparison tests/test-merge-revert2.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 9c35f3a8cac4
children ce3a133f71b3
comparison
equal deleted inserted replaced
26613:abb5ec3eb6ce 26614:ef1eb6df7071
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 $ echo "changed file1 different" >> file1 43 $ echo "changed file1 different" >> file1
44 44
45 $ hg update 45 $ hg update
46 merging file1 46 merging file1
47 warning: conflicts during merge. 47 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
48 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 48 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
50 use 'hg resolve' to retry unresolved file merges 49 use 'hg resolve' to retry unresolved file merges
51 [1] 50 [1]
52 51
53 $ hg diff --nodates 52 $ hg diff --nodates