Mercurial > hg
view tests/test-mq-qimport-fail-cleanup.t @ 23155:25e12d496429
test-revert: removing a missing file has no effect
The tests for removed_deleted and removed_removed test the same state
as removed_clean and removed_untracked-clean, respectively. Drop the
duplicate tests.
See additional motivation in earlier patch.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 16 Oct 2014 23:59:08 -0700 |
parents | f2719b387380 |
children | 0342bf292f73 |
line wrap: on
line source
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 ..