Mercurial > hg
view tests/test-mq-qimport-fail-cleanup.t @ 13565:984175605311 stable
filemerge: introduce a 'regkeyalt' merge tool variable
This allows us to provide alternate search keys for 64bit operating systems that
may have 32bit merge tools installed. Presumably it may find other uses.
author | Steve Borho <steve@borho.org> |
---|---|
date | Tue, 08 Mar 2011 13:05:18 -0600 |
parents | 8b12768b15e2 |
children | 1e9451476bf8 |
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 $ echo empty series $ hg qseries $ echo 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] $ echo valid patches before fail added to series $ hg qseries b.patch