mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
test-mergedriver.t: update --clean in between failing merges
Mercurial changeset e96bb53bb99a changed things so that if there were unresolved conflicts you could no longer do another merge.
This commit is contained in:
parent
baf5e9ba04
commit
a31e5c1096
@ -462,6 +462,8 @@ test some other failure modes
|
||||
$ hg merge 1 --config experimental.mergedriver=fail
|
||||
abort: merge driver must be a python hook
|
||||
[255]
|
||||
$ hg update --clean 2
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
this should proceed as if there's no merge driver
|
||||
$ hg merge 1 --config experimental.mergedriver=python:fail
|
||||
loading preprocess hook failed:
|
||||
|
Loading…
Reference in New Issue
Block a user