Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 5747:8e4f6354b316 mercurial-5.6
tests: back out changeset b3d9e6c805d6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:36 +0800 |
| parents | e5d91fd1f319 |
| children | c2c85576ddfb fd039a7f0c3c |
comparison
equal
deleted
inserted
replaced
| 5746:feb28638ec6c | 5747:8e4f6354b316 |
|---|---|
| 95 rebasing to destination parent: ca1b80f7960a | 95 rebasing to destination parent: ca1b80f7960a |
| 96 merging c | 96 merging c |
| 97 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 97 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 98 unresolved merge conflicts | 98 unresolved merge conflicts |
| 99 (see 'hg help evolve.interrupted') | 99 (see 'hg help evolve.interrupted') |
| 100 [240] | 100 [1] |
| 101 | 101 |
| 102 testing that interrupted evolve shows up in morestatus | 102 testing that interrupted evolve shows up in morestatus |
| 103 $ hg status -v | 103 $ hg status -v |
| 104 M c | 104 M c |
| 105 A d | 105 A d |
| 214 rebasing to destination parent: b1661037fa25 | 214 rebasing to destination parent: b1661037fa25 |
| 215 merging b | 215 merging b |
| 216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 217 unresolved merge conflicts | 217 unresolved merge conflicts |
| 218 (see 'hg help evolve.interrupted') | 218 (see 'hg help evolve.interrupted') |
| 219 [240] | 219 [1] |
| 220 | 220 |
| 221 $ hg abort | 221 $ hg abort |
| 222 1 new phase-divergent changesets | 222 1 new phase-divergent changesets |
| 223 evolve aborted | 223 evolve aborted |
| 224 working directory is now at 28cd06b3f801 | 224 working directory is now at 28cd06b3f801 |
| 284 rebasing to destination parent: b1661037fa25 | 284 rebasing to destination parent: b1661037fa25 |
| 285 merging b | 285 merging b |
| 286 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 286 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 287 unresolved merge conflicts | 287 unresolved merge conflicts |
| 288 (see 'hg help evolve.interrupted') | 288 (see 'hg help evolve.interrupted') |
| 289 [240] | 289 [1] |
| 290 | 290 |
| 291 $ echo watwat > c | 291 $ echo watwat > c |
| 292 $ hg resolve -m | 292 $ hg resolve -m |
| 293 (no more unresolved files) | 293 (no more unresolved files) |
| 294 continue: hg evolve --continue | 294 continue: hg evolve --continue |
| 300 rebasing to destination parent: ca1b80f7960a | 300 rebasing to destination parent: ca1b80f7960a |
| 301 merging c | 301 merging c |
| 302 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 302 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 303 unresolved merge conflicts | 303 unresolved merge conflicts |
| 304 (see 'hg help evolve.interrupted') | 304 (see 'hg help evolve.interrupted') |
| 305 [240] | 305 [1] |
| 306 | 306 |
| 307 $ hg abort | 307 $ hg abort |
| 308 1 new phase-divergent changesets | 308 1 new phase-divergent changesets |
| 309 evolve aborted | 309 evolve aborted |
| 310 working directory is now at ef9b72b9b42c | 310 working directory is now at ef9b72b9b42c |