Skip to content
Snippets Groups Projects
Commit 8b12768b authored by Matt Mackall's avatar Matt Mackall
Browse files

tests: unify test-mq-qimport-fail-cleanup

parent 3177e3a7
No related branches found
No related tags found
No related merge requests found
adding a
#empty series
#qimport valid patch followed by invalid patch
adding b.patch to series file
abort: unable to read file fakepatch
#valid patches before fail added to series
b.patch
#!/bin/sh
#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'
Failed qimport of patches from files should cleanup by recording successfully
imported patches in series file.
......@@ -13,10 +3,19 @@
cat >b.patch<<EOF
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
a
+b
EOF
$ 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
......@@ -22,5 +21,9 @@
echo
echo '#empty series'
hg qseries
empty series
$ hg qseries
$ echo
qimport valid patch followed by invalid patch
......@@ -26,5 +29,8 @@
echo
echo '#qimport valid patch followed by invalid patch'
hg qimport b.patch fakepatch
$ hg qimport b.patch fakepatch
adding b.patch to series file
abort: unable to read file fakepatch
[255]
$ echo
......@@ -30,4 +36,5 @@
echo
echo '#valid patches before fail added to series'
hg qseries
valid patches before fail added to series
$ hg qseries
b.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment