##// END OF EJS Templates
merge with default to begin 4.6 freeze...
merge with default to begin 4.6 freeze # no-check-commit because of many vendored packages

File last commit:

r29968:0342bf29 default
r37806:ed5448ed merge 4.6rc0 stable
Show More
test-mq-qimport-fail-cleanup.t
42 lines | 772 B | text/troff | Tads3Lexer
/ tests / test-mq-qimport-fail-cleanup.t
Matt Mackall
tests: unify test-mq-qimport-fail-cleanup
r12465 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
Pierre-Yves David
phases: prevent mq to qimport immutable change.
r15704
$ hg pull -q -r 0 . # update phase
$ hg qimport -r 0
abort: revision 0 is not mutable
timeless
mq: use single quotes in use warning
r29968 (see 'hg help phases' for details)
Pierre-Yves David
phases: prevent mq to qimport immutable change.
r15704 [255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..