Mercurial > hg
view tests/test-mq-qimport-fail-cleanup.t @ 23305:0cc283f44655
manifest: add matches() method
Move the code in context._manifestmatches() into a new
manifest.matches(). It's a natural place for the code to live and it
allows other callers to easily use it. It should also make it easier
to optimize the new method in alternative implementations of the
manifest (same reasoning as with manifest.diff()).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 22 Oct 2014 21:38:30 -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 ..