Mercurial > evolve
diff tests/test-unstable.t @ 1638:5b7596805f7f
evolve: treat no support as non fatal
When running evolve --all, unhandled edges should not block other
revisions from being solved.
| author | timeless@gmail.com |
|---|---|
| date | Thu, 14 Apr 2016 15:02:10 +0000 |
| parents | 526253198860 |
| children | ff0ff0f28a13 |
line wrap: on
line diff
--- a/tests/test-unstable.t Wed Apr 13 23:36:44 2016 +0000 +++ b/tests/test-unstable.t Thu Apr 14 15:02:10 2016 +0000 @@ -154,9 +154,8 @@ $ hg evo --all --any --unstable - abort: no support for evolving merge changesets with two obsolete parents yet + warning: no support for evolving merge changesets with two obsolete parents yet (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) - [255] $ hg log -G @ 5:2db39fda7e2f@default(draft) cprime |