Mercurial > evolve
diff tests/test-evolve-orphan-merge.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 | f0096db2a7b1 |
| children | d00f0c369bc7 4eb3877540f1 |
line wrap: on
line diff
--- a/tests/test-evolve-orphan-merge.t Thu Jun 14 02:58:30 2018 +0200 +++ b/tests/test-evolve-orphan-merge.t Fri Jun 15 00:16:29 2018 +0530 @@ -219,8 +219,8 @@ atop:[11] foo to c merging c warning: conflicts while merging c! (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] $ echo FOObar > c $ hg resolve -m @@ -274,8 +274,8 @@ atop:[13] foo to c merging c warning: conflicts while merging c! (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] $ echo foobar > c $ hg resolve -m