Mercurial > evolve
comparison tests/test-stabilize-result.t @ 1395:362e2c8c5677 stable
evolve: add a hint about how to abort an evolve with conflict
The whole evolve --continue is hacky, but the way to abort it have been arcane
knowledge, carried from sith lord to its apprentice for centuries. We add a hint
to help the use discover it.
One day a clean solution will come.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 19 Jun 2015 10:44:25 -0700 |
| parents | 03f202bed47f |
| children | ba95cec18fe9 |
comparison
equal
deleted
inserted
replaced
| 1394:e12082872afc | 1395:362e2c8c5677 |
|---|---|
| 83 atop:[7] changea | 83 atop:[7] changea |
| 84 merging a | 84 merging a |
| 85 warning: conflicts during merge. | 85 warning: conflicts during merge. |
| 86 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | 86 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 87 evolve failed! | 87 evolve failed! |
| 88 fix conflict and run "hg evolve --continue" | 88 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
| 89 abort: unresolved merge conflicts (see hg help resolve) | 89 abort: unresolved merge conflicts (see hg help resolve) |
| 90 [255] | 90 [255] |
| 91 $ hg revert -r 'unstable()' a | 91 $ hg revert -r 'unstable()' a |
| 92 $ hg diff | 92 $ hg diff |
| 93 diff -r 66719795a494 a | 93 diff -r 66719795a494 a |