Mercurial > evolve
diff tests/test-evolve-abort-contentdiv.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 | 796334340cad |
line wrap: on
line diff
--- a/tests/test-evolve-abort-contentdiv.t Thu Jun 14 02:58:30 2018 +0200 +++ b/tests/test-evolve-abort-contentdiv.t Fri Jun 15 00:16:29 2018 +0530 @@ -78,8 +78,8 @@ merging d warning: conflicts while merging d! (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] $ hg status -v M d @@ -177,8 +177,8 @@ merging d warning: conflicts while merging d! (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] $ hg evolve --abort 2 new content-divergent changesets @@ -338,8 +338,8 @@ merging d warning: conflicts while merging d! (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] $ hg evolve --abort evolve aborted