Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 6506:874e910d32b1 mercurial-6.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.4 into mercurial-6.3
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 30 Jun 2023 15:02:59 -0300
parents db0fd1f1a7d0
children 019da9cc0ac5
comparison
equal deleted inserted replaced
6459:97c1ed0e560f 6506:874e910d32b1
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 state files for evolve and merge before abort
584
585 $ find .hg/ -name '*state' | grep -v dirstate | sort
586 .hg/evolvestate
587 .hg/merge/state
588
589 The files are gone after abort
590
583 $ hg abort 591 $ hg abort
584 evolve aborted 592 evolve aborted
585 working directory is now at c1f4718020e3 593 working directory is now at c1f4718020e3
586 594 $ find .hg/ -name '*state' | grep -v dirstate
587 $ ls .hg/ 595 [1]
588 00changelog.i
589 bookmarks
590 branch
591 cache
592 dirstate
593 last-message.txt
594 requires
595 store
596 undo.backup.bookmarks (no-hg64 !)
597 undo.backup.branch (hg64 !)
598 undo.backup.dirstate
599 undo.bookmarks (no-hg64 !)
600 undo.branch (no-hg64 !)
601 undo.desc
602 undo.dirstate (no-hg64 !)
603 wcache