Mercurial > evolve
comparison tests/test-evolve-stop-contentdiv.t @ 3842:b293cce4ff55
evolve: point to `hg help evolve.interrupted` while resolving content-div
Recent test additions shows that --abort and --stop works well while resolving
content-divergence and we should advertise them. This patch does so by pointing
to evolve.interrupted help topic.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 12 Jun 2018 04:01:19 +0530 |
| parents | c58ebf5d2f57 |
| children | 629558d09898 |
comparison
equal
deleted
inserted
replaced
| 3841:82b79a8dafd9 | 3842:b293cce4ff55 |
|---|---|
| 73 base: [4] added d | 73 base: [4] added d |
| 74 merging "other" content-divergent changeset 'e49523854bc8' | 74 merging "other" content-divergent changeset 'e49523854bc8' |
| 75 merging d | 75 merging d |
| 76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 78 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort | 78 abort: fix conflicts and see `hg help evolve.interrupted` |
| 79 [255] | 79 [255] |
| 80 | 80 |
| 81 $ hg evolve --stop | 81 $ hg evolve --stop |
| 82 stopped the interrupted evolve | 82 stopped the interrupted evolve |
| 83 working directory is now at 9c1631e352d9 | 83 working directory is now at 9c1631e352d9 |
| 127 updating to "local" side of the conflict: e49523854bc8 | 127 updating to "local" side of the conflict: e49523854bc8 |
| 128 merging "other" content-divergent changeset '606ad96040fc' | 128 merging "other" content-divergent changeset '606ad96040fc' |
| 129 merging d | 129 merging d |
| 130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 132 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort | 132 abort: fix conflicts and see `hg help evolve.interrupted` |
| 133 [255] | 133 [255] |
| 134 | 134 |
| 135 $ hg evolve --stop | 135 $ hg evolve --stop |
| 136 stopped the interrupted evolve | 136 stopped the interrupted evolve |
| 137 working directory is now at 517d4375cb72 | 137 working directory is now at 517d4375cb72 |