Mercurial > evolve
diff tests/test-stabilize-result.t @ 3852:629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
error.InterventionRequired is a better error to raise in such cases.
Thanks to marmoute for noticing this.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2018 00:16:29 +0530 |
| parents | f9dad99a90d5 |
| children | f7afd3a158e3 25981fae92f9 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Thu Jun 14 02:58:30 2018 +0200 +++ b/tests/test-stabilize-result.t Fri Jun 15 00:16:29 2018 +0530 @@ -81,8 +81,8 @@ atop:[5] changea merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - abort: fix conflicts and see `hg help evolve.interrupted` - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg revert -r "orphan()" a $ hg diff diff -r 66719795a494 a @@ -390,8 +390,8 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - abort: fix conflicts and see `hg help evolve.interrupted` - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ cat > a <<EOF > jungle