Mercurial > evolve
comparison tests/test-evolve-abort-orphan.t @ 6491:173293415d1f
tests: capture .hg/merge/state presence as well
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 25 May 2023 11:08:09 -0300 |
| parents | 24f1f34b4a5e |
| children | 019da9cc0ac5 |
comparison
equal
deleted
inserted
replaced
| 6490:24f1f34b4a5e | 6491:173293415d1f |
|---|---|
| 578 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 578 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 579 unresolved merge conflicts | 579 unresolved merge conflicts |
| 580 (see 'hg help evolve.interrupted') | 580 (see 'hg help evolve.interrupted') |
| 581 [240] | 581 [240] |
| 582 | 582 |
| 583 We do have a state file before abort | 583 We do have state files for evolve and merge before abort |
| 584 | 584 |
| 585 $ ls .hg/ | grep evolvestate | 585 $ find .hg/ -name '*state' | grep -v dirstate | sort |
| 586 evolvestate | 586 .hg/evolvestate |
| 587 | 587 .hg/merge/state |
| 588 The file is gone after abort | 588 |
| 589 The files are gone after abort | |
| 589 | 590 |
| 590 $ hg abort | 591 $ hg abort |
| 591 evolve aborted | 592 evolve aborted |
| 592 working directory is now at c1f4718020e3 | 593 working directory is now at c1f4718020e3 |
| 593 $ ls .hg/ | grep evolvestate | 594 $ find .hg/ -name '*state' | grep -v dirstate |
| 594 [1] | 595 [1] |