Mercurial > evolve
comparison tests/test-evolve-abort.t @ 3817:5ca297e78f2c mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 08 Jun 2018 22:52:52 +0530 |
| parents | 19ec729f3ca2 2d450974bb1c |
| children | f8677cb11dcb |
comparison
equal
deleted
inserted
replaced
| 3723:e70ad3983872 | 3817:5ca297e78f2c |
|---|---|
| 490 | | (bm1) draft | 490 | | (bm1) draft |
| 491 | x 1:2f913b0c9220 added a | 491 | x 1:2f913b0c9220 added a |
| 492 |/ () draft | 492 |/ () draft |
| 493 o 0:8fa14d15e168 added hgignore | 493 o 0:8fa14d15e168 added hgignore |
| 494 () draft | 494 () draft |
| 495 | |
| 496 Testing `--abort` when conflicts are caused due to `hg next --evolve` | |
| 497 ===================================================================== | |
| 498 | |
| 499 $ hg next --evolve | |
| 500 move:[2] added b | |
| 501 atop:[4] added a | |
| 502 working directory now at c1f4718020e3 | |
| 503 $ hg next --evolve | |
| 504 move:[3] added c | |
| 505 atop:[5] added b | |
| 506 merging c | |
| 507 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | |
| 508 evolve failed! | |
| 509 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | |
| 510 abort: unresolved merge conflicts (see hg help resolve) | |
| 511 [255] | |
| 512 | |
| 513 $ hg evolve --abort | |
| 514 evolve aborted | |
| 515 working directory is now at c1f4718020e3 |