Mercurial > hg
comparison tests/test-convert-svn-sink.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 | 4d2b9b304ad0 |
children | 75be14993fda |
comparison
equal
deleted
inserted
replaced
26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
---|---|
380 | 380 |
381 $ hg --cwd b up -C 2 | 381 $ hg --cwd b up -C 2 |
382 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | 382 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
383 $ hg --cwd b merge | 383 $ hg --cwd b merge |
384 merging b | 384 merging b |
385 warning: conflicts during merge. | 385 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
386 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') | |
387 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 386 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
388 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 387 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
389 [1] | 388 [1] |
390 $ hg --cwd b revert -r 2 b | 389 $ hg --cwd b revert -r 2 b |
391 $ hg --cwd b resolve -m b | 390 $ hg --cwd b resolve -m b |