Mercurial > evolve
comparison tests/test-unstable.t @ 1639:ff0ff0f28a13
evolve: report merge node
When running evolve --any, evolve will report that it can not
handle a merge node. In order for this to be helpful, we report
the revision so that a user could fix t.
| author | timeless@gmail.com |
|---|---|
| date | Thu, 14 Apr 2016 15:03:18 +0000 |
| parents | 5b7596805f7f |
| children | 093c445fd86a 9f42f819267b |
comparison
equal
deleted
inserted
replaced
| 1638:5b7596805f7f | 1639:ff0ff0f28a13 |
|---|---|
| 153 o 0:b4952fcf48cf@default(draft) add base | 153 o 0:b4952fcf48cf@default(draft) add base |
| 154 | 154 |
| 155 | 155 |
| 156 $ hg evo --all --any --unstable | 156 $ hg evo --all --any --unstable |
| 157 warning: no support for evolving merge changesets with two obsolete parents yet | 157 warning: no support for evolving merge changesets with two obsolete parents yet |
| 158 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) | 158 (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one) |
| 159 $ hg log -G | 159 $ hg log -G |
| 160 @ 5:2db39fda7e2f@default(draft) cprime | 160 @ 5:2db39fda7e2f@default(draft) cprime |
| 161 | | 161 | |
| 162 | o 4:47127ea62e5f@default(draft) aprime | 162 | o 4:47127ea62e5f@default(draft) aprime |
| 163 |/ | 163 |/ |