comparison tests/test-shelve.t @ 44210:d0c3eead515a

copies: fix crash when copy source is not in graft base

Differential Revision: https://phab.mercurial-scm.org/D8046

44209:ae4d729eb3c8

  ! ghost
    d

the common case - no options or filenames

  $ hg shelve 2>&1 | grep KeyError
  KeyError: 'No such manifest entry.' (no-pure !)
      raise KeyError (pure !)
  KeyError (pure !)
# Get out of the broken state so later tests work
  $ hg forget b.rename/b c.copy ghost
  $ hg revert a/a b/b d
  $ rm a/a.orig b.rename/b c.copy
  $ hg status -C

ensure that our shelved changes exist

  $ hg shelve -l

ensure that we have a merge with unresolved conflicts

#if phasebased
  $ hg heads -q --template '{rev}\n'
  8
  6
  $ hg parents -q --template '{rev}\n'
  8
  6
#endif

#if stripbased
  $ hg heads -q --template '{rev}\n'
  5

44210:d0c3eead515a

  ! ghost
    d

the common case - no options or filenames

  $ hg shelve
  shelved as default-01
  3 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ hg status -C

ensure that our shelved changes exist

  $ hg shelve -l

ensure that we have a merge with unresolved conflicts

#if phasebased
  $ hg heads -q --template '{rev}\n'
  8
  5
  $ hg parents -q --template '{rev}\n'
  8
  5
#endif

#if stripbased
  $ hg heads -q --template '{rev}\n'
  5