Mercurial > evolve
comparison tests/test-evolve-content-divergence.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 | 3273b178c202 |
| children | 48fbccfd1dff |
comparison
equal
deleted
inserted
replaced
| 3841:82b79a8dafd9 | 3842:b293cce4ff55 |
|---|---|
| 173 base: [10] added a d with bar in it, expect some beers | 173 base: [10] added a d with bar in it, expect some beers |
| 174 merging "other" content-divergent changeset 'eba0b02801cb' | 174 merging "other" content-divergent changeset 'eba0b02801cb' |
| 175 merging d | 175 merging d |
| 176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 178 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort | 178 abort: fix conflicts and see `hg help evolve.interrupted` |
| 179 [255] | 179 [255] |
| 180 | 180 |
| 181 $ echo foobar > d | 181 $ echo foobar > d |
| 182 $ hg resolve -m | 182 $ hg resolve -m |
| 183 (no more unresolved files) | 183 (no more unresolved files) |
| 233 base: [13] foo to d | 233 base: [13] foo to d |
| 234 merging "other" content-divergent changeset '9ad4721c9004' | 234 merging "other" content-divergent changeset '9ad4721c9004' |
| 235 merging d | 235 merging d |
| 236 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 236 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 237 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 237 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 238 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort | 238 abort: fix conflicts and see `hg help evolve.interrupted` |
| 239 [255] | 239 [255] |
| 240 | 240 |
| 241 $ echo watbar > d | 241 $ echo watbar > d |
| 242 $ hg resolve -m | 242 $ hg resolve -m |
| 243 (no more unresolved files) | 243 (no more unresolved files) |
| 530 updating to "local" side of the conflict: 4065e1d314c3 | 530 updating to "local" side of the conflict: 4065e1d314c3 |
| 531 merging "other" content-divergent changeset '6d515d1ffc69' | 531 merging "other" content-divergent changeset '6d515d1ffc69' |
| 532 merging y | 532 merging y |
| 533 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 533 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 534 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 534 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 535 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort | 535 abort: fix conflicts and see `hg help evolve.interrupted` |
| 536 [255] | 536 [255] |
| 537 | 537 |
| 538 $ echo watbar > y | 538 $ echo watbar > y |
| 539 $ hg resolve -m | 539 $ hg resolve -m |
| 540 (no more unresolved files) | 540 (no more unresolved files) |