mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
a6dc53e738
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.
27 lines
486 B
Perl
27 lines
486 B
Perl
Test update logic when there are renames
|
|
|
|
Update with local changes across a file rename
|
|
|
|
$ hg init
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg ci -m a
|
|
|
|
$ hg mv a b
|
|
$ hg ci -m rename
|
|
|
|
$ echo b > b
|
|
$ hg ci -m change
|
|
|
|
$ hg up -q 0
|
|
|
|
$ echo c > a
|
|
|
|
$ hg up
|
|
merging a and b to b
|
|
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]
|