Show More
@@ -0,0 +1,43 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | # Test that qpush cleans things up if it doesn't complete | |||
|
4 | ||||
|
5 | echo "[extensions]" >> $HGRCPATH | |||
|
6 | echo "mq=" >> $HGRCPATH | |||
|
7 | ||||
|
8 | hg init repo | |||
|
9 | cd repo | |||
|
10 | ||||
|
11 | echo foo > foo | |||
|
12 | hg ci -Am 'add foo' -d '0 0' | |||
|
13 | ||||
|
14 | touch untracked-file | |||
|
15 | echo 'syntax: glob' > .hgignore | |||
|
16 | echo '.hgignore' >> .hgignore | |||
|
17 | ||||
|
18 | hg qinit | |||
|
19 | hg qnew patch1 | |||
|
20 | echo >> foo | |||
|
21 | hg qrefresh -m 'patch 1' | |||
|
22 | ||||
|
23 | hg qnew patch2 | |||
|
24 | echo bar > bar | |||
|
25 | hg add bar | |||
|
26 | hg qrefresh -m 'patch 2' | |||
|
27 | ||||
|
28 | hg qnew bad-patch | |||
|
29 | echo >> foo | |||
|
30 | hg qrefresh | |||
|
31 | ||||
|
32 | hg qpop -a | |||
|
33 | ||||
|
34 | python -c 'print "\xe9"' > message | |||
|
35 | cat .hg/patches/bad-patch >> message | |||
|
36 | mv message .hg/patches/bad-patch | |||
|
37 | ||||
|
38 | hg qpush -a && echo 'qpush succeded?!' | |||
|
39 | ||||
|
40 | hg parents | |||
|
41 | ||||
|
42 | echo '% bar should be gone; other unknown/ignored files should still be around' | |||
|
43 | hg status -A |
@@ -0,0 +1,19 b'' | |||||
|
1 | adding foo | |||
|
2 | Patch queue now empty | |||
|
3 | applying patch1 | |||
|
4 | applying patch2 | |||
|
5 | applying bad-patch | |||
|
6 | transaction abort! | |||
|
7 | rollback completed | |||
|
8 | cleaning up working directory...done | |||
|
9 | abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! | |||
|
10 | changeset: 0:bbd179dfa0a7 | |||
|
11 | tag: tip | |||
|
12 | user: test | |||
|
13 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
14 | summary: add foo | |||
|
15 | ||||
|
16 | % bar should be gone; other unknown/ignored files should still be around | |||
|
17 | ? untracked-file | |||
|
18 | I .hgignore | |||
|
19 | C foo |
General Comments 0
You need to be logged in to leave comments.
Login now