Mercurial > hg
comparison tests/test-merge7.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 | a5ff66e6d77a |
children | 8e6d5b7317e6 |
comparison
equal
deleted
inserted
replaced
26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
---|---|
42 adding file changes | 42 adding file changes |
43 added 1 changesets with 1 changes to 1 files (+1 heads) | 43 added 1 changesets with 1 changes to 1 files (+1 heads) |
44 (run 'hg heads' to see heads, 'hg merge' to merge) | 44 (run 'hg heads' to see heads, 'hg merge' to merge) |
45 $ hg merge | 45 $ hg merge |
46 merging test.txt | 46 merging test.txt |
47 warning: conflicts during merge. | 47 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
48 merging test.txt 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 or 'hg update -C .' to abandon | 49 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
51 [1] | 50 [1] |
52 resolve conflict | 51 resolve conflict |
53 $ cat >test.txt <<"EOF" | 52 $ cat >test.txt <<"EOF" |
89 picked tool ':merge' for test.txt (binary False symlink False) | 88 picked tool ':merge' for test.txt (binary False symlink False) |
90 merging test.txt | 89 merging test.txt |
91 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | 90 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
92 picked tool ':merge' for test.txt (binary False symlink False) | 91 picked tool ':merge' for test.txt (binary False symlink False) |
93 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | 92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
94 warning: conflicts during merge. | 93 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
95 merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | |
96 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 94 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
97 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 95 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
98 [1] | 96 [1] |
99 | 97 |
100 $ cat test.txt | 98 $ cat test.txt |