Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | fd039a7f0c3c |
| children | 67fc03f42d92 43c4db536990 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 103 rebasing to destination parent: ca1b80f7960a | 103 rebasing to destination parent: ca1b80f7960a |
| 104 merging c | 104 merging c |
| 105 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 105 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 106 unresolved merge conflicts | 106 unresolved merge conflicts |
| 107 (see 'hg help evolve.interrupted') | 107 (see 'hg help evolve.interrupted') |
| 108 [240] | 108 [1] |
| 109 | 109 |
| 110 testing that interrupted evolve shows up in morestatus | 110 testing that interrupted evolve shows up in morestatus |
| 111 $ hg status -v | 111 $ hg status -v |
| 112 M c | 112 M c |
| 113 A d | 113 A d |
| 222 rebasing to destination parent: b1661037fa25 | 222 rebasing to destination parent: b1661037fa25 |
| 223 merging b | 223 merging b |
| 224 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 224 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 225 unresolved merge conflicts | 225 unresolved merge conflicts |
| 226 (see 'hg help evolve.interrupted') | 226 (see 'hg help evolve.interrupted') |
| 227 [240] | 227 [1] |
| 228 | 228 |
| 229 $ hg abort | 229 $ hg abort |
| 230 1 new phase-divergent changesets | 230 1 new phase-divergent changesets |
| 231 evolve aborted | 231 evolve aborted |
| 232 working directory is now at 28cd06b3f801 | 232 working directory is now at 28cd06b3f801 |
| 292 rebasing to destination parent: b1661037fa25 | 292 rebasing to destination parent: b1661037fa25 |
| 293 merging b | 293 merging b |
| 294 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 294 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 295 unresolved merge conflicts | 295 unresolved merge conflicts |
| 296 (see 'hg help evolve.interrupted') | 296 (see 'hg help evolve.interrupted') |
| 297 [240] | 297 [1] |
| 298 | 298 |
| 299 $ echo watwat > c | 299 $ echo watwat > c |
| 300 $ hg resolve -m | 300 $ hg resolve -m |
| 301 (no more unresolved files) | 301 (no more unresolved files) |
| 302 continue: hg evolve --continue | 302 continue: hg evolve --continue |
| 308 rebasing to destination parent: ca1b80f7960a | 308 rebasing to destination parent: ca1b80f7960a |
| 309 merging c | 309 merging c |
| 310 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 310 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 311 unresolved merge conflicts | 311 unresolved merge conflicts |
| 312 (see 'hg help evolve.interrupted') | 312 (see 'hg help evolve.interrupted') |
| 313 [240] | 313 [1] |
| 314 | 314 |
| 315 $ hg abort | 315 $ hg abort |
| 316 1 new phase-divergent changesets | 316 1 new phase-divergent changesets |
| 317 evolve aborted | 317 evolve aborted |
| 318 working directory is now at ef9b72b9b42c | 318 working directory is now at ef9b72b9b42c |