Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 6516:39d4c87b579e mercurial-5.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.4 into mercurial-5.3
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 02 Jul 2023 12:56:54 -0300
parents 76716ec978da 358bdf940e56
children e802817cca83
comparison
equal deleted inserted replaced
6469:76716ec978da 6516:39d4c87b579e
554 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 554 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
555 unresolved merge conflicts 555 unresolved merge conflicts
556 (see 'hg help evolve.interrupted') 556 (see 'hg help evolve.interrupted')
557 [1] 557 [1]
558 558
559 We do have state files for evolve and merge before abort
560
561 $ find .hg/ -name '*state' | grep -v dirstate | sort
562 .hg/evolvestate
563 .hg/merge/state
564
565 The files are gone after abort
566
559 $ hg abort 567 $ hg abort
560 evolve aborted 568 evolve aborted
561 working directory is now at c1f4718020e3 569 working directory is now at c1f4718020e3
562 570 $ find .hg/ -name '*state' | grep -v dirstate
563 $ ls .hg/ 571 [1]
564 00changelog.i
565 bookmarks
566 branch
567 cache
568 dirstate
569 last-message.txt
570 requires
571 store
572 undo.backup.bookmarks (no-hg64 !)
573 undo.backup.branch (hg64 !)
574 undo.backup.dirstate
575 undo.bookmarks (no-hg64 !)
576 undo.branch (no-hg64 !)
577 undo.desc
578 undo.dirstate (no-hg64 !)
579 wcache