mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
a3baf6a2e7
ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool
45 lines
842 B
Perl
45 lines
842 B
Perl
test that a commit clears the merge state.
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo foo > file
|
|
$ hg commit -Am 'add file'
|
|
adding file
|
|
|
|
$ echo bar >> file
|
|
$ hg commit -Am 'append bar'
|
|
|
|
|
|
create a second head
|
|
|
|
$ hg up -C 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo baz >> file
|
|
$ hg commit -Am 'append baz'
|
|
created new head
|
|
|
|
failing merge
|
|
|
|
$ hg merge --tool=internal:fail
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
$ echo resolved > file
|
|
$ hg resolve -m file
|
|
$ hg commit -m 'resolved'
|
|
|
|
resolve -l, should be empty
|
|
|
|
$ hg resolve -l
|
|
|
|
test crashed merge with empty mergestate
|
|
|
|
$ mkdir .hg/merge
|
|
$ touch .hg/merge/state
|
|
|
|
resolve -l, should be empty
|
|
|
|
$ hg resolve -l
|