comparison tests/test-evolve-abort-orphan.t @ 6521:2226c9873533 mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8

6474:5f77d112be57

  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts
  (see 'hg help evolve.interrupted')
  [1]

  $ hg abort
  evolve aborted
  working directory is now at c1f4718020e3

  $ ls .hg/
  00changelog.i
  bookmarks
  branch
  cache
  dirstate
  last-message.txt
  requires
  store
  undo.backup.bookmarks
  undo.backup.dirstate
  undo.bookmarks
  undo.branch
  undo.desc
  undo.dirstate

6521:2226c9873533

  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts
  (see 'hg help evolve.interrupted')
  [1]

We do have state files for evolve and merge before abort

  $ find .hg/ -name '*state' | grep -v dirstate | sort
  .hg/evolvestate
  .hg/merge/state

The files are gone after abort

  $ hg abort
  evolve aborted
  working directory is now at c1f4718020e3
  $ find .hg/ -name '*state' | grep -v dirstate
  [1]