Mercurial > hg
annotate tests/test-mq-qimport-fail-cleanup.t @ 13290:82133e91ce7d
record: turn consumefile() into a pure function
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 12:44:05 +0100 |
parents | 8b12768b15e2 |
children | 1e9451476bf8 |
rev | line source |
---|---|
12465
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
1 Failed qimport of patches from files should cleanup by recording successfully |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
2 imported patches in series file. |
11462
1b82a26635d7
mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff
changeset
|
3 |
12465
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
4 $ echo "[extensions]" >> $HGRCPATH |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
5 $ echo "mq=" >> $HGRCPATH |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
6 $ hg init repo |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
7 $ cd repo |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
8 $ echo a > a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
9 $ hg ci -Am'add a' |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
10 adding a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
11 $ cat >b.patch<<EOF |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
12 > diff --git a/a b/a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
13 > --- a/a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
14 > +++ b/a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
15 > @@ -1,1 +1,2 @@ |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
16 > a |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
17 > +b |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
18 > EOF |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
19 $ echo |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
20 |
11462
1b82a26635d7
mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff
changeset
|
21 |
12465
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
22 empty series |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
23 |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
24 $ hg qseries |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
25 $ echo |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
26 |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
27 |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
28 qimport valid patch followed by invalid patch |
11462
1b82a26635d7
mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff
changeset
|
29 |
12465
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
30 $ hg qimport b.patch fakepatch |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
31 adding b.patch to series file |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
32 abort: unable to read file fakepatch |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
33 [255] |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
34 $ echo |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
35 |
11462
1b82a26635d7
mq: qimport cleanup on fail (issue2214)
Vishakh H <vsh426@gmail.com>
parents:
diff
changeset
|
36 |
12465
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
37 valid patches before fail added to series |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
38 |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
39 $ hg qseries |
8b12768b15e2
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com>
parents:
11462
diff
changeset
|
40 b.patch |