tests/test-mq-qimport-fail-cleanup.t
author Siddharth Agarwal <sid0@fb.com>
Wed, 18 Nov 2015 16:39:30 -0800
changeset 27022 35102876d648
parent 16913 f2719b387380
child 29972 0342bf292f73
permissions -rw-r--r--
mergestate: move binary format documentation into _readrecordsv2 This is too low-level to be the top-level documentation for mergestate. We're restricting the top-level documentation to only be about what consumers of the mergestate and anyone extending it need to care about.

Failed qimport of patches from files should cleanup by recording successfully
imported patches in series file.

  $ echo "[extensions]" >> $HGRCPATH
  $ echo "mq=" >> $HGRCPATH
  $ hg init repo
  $ cd repo
  $ echo a > a
  $ hg ci -Am'add a'
  adding a
  $ cat >b.patch<<EOF
  > diff --git a/a b/a
  > --- a/a
  > +++ b/a
  > @@ -1,1 +1,2 @@
  >  a
  > +b
  > EOF

empty series

  $ hg qseries

qimport valid patch followed by invalid patch

  $ hg qimport b.patch fakepatch
  adding b.patch to series file
  abort: unable to read file fakepatch
  [255]

valid patches before fail added to series

  $ hg qseries
  b.patch

  $ hg pull -q -r 0 . # update phase
  $ hg qimport -r 0
  abort: revision 0 is not mutable
  (see "hg help phases" for details)
  [255]

  $ cd ..