comparison tests/test-shelve.t @ 42668:52a383451739

unshelve: add abort on using continue and interactive together

`unshelve --continue --interactive` will not work as expected by the
user as the mode of in-progress unshelve is preserved and cannot be
overwritten. This patch makes `unshelve` to throw an error on using
both `--continue` and `--interactive` together with `unshelve`.

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

42667:6d50a7ebf7e0

  > C
  > EOF
  $ hg resolve -m bar1 bar2
  (no more unresolved files)
  continue: hg unshelve --continue
  $ cat bar1
  A
  B
  C
  $ hg unshelve --continue <<EOF

42668:52a383451739

  > C
  > EOF
  $ hg resolve -m bar1 bar2
  (no more unresolved files)
  continue: hg unshelve --continue

-- using --continue with --interactive should throw an error
  $ hg unshelve --continue -i
  abort: cannot use both continue and interactive
  [255]

  $ cat bar1
  A
  B
  C
  $ hg unshelve --continue <<EOF