Mercurial > hg
annotate tests/test-mq-guards.out @ 8144:fca54469480e
ui: introduce new config parser
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 23 Apr 2009 15:40:10 -0500 |
parents | fb32ae9c76e7 |
children | 561ff8d9e4f0 |
rev | line source |
---|---|
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 adding x |
7627 | 2 patch queue now empty |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 % should fail |
4133
a9ee6c53af8d
mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents:
3873
diff
changeset
|
4 abort: no patch named does-not-exist.patch |
a9ee6c53af8d
mq: abort cleanly when invalid patch name is given to qguard
Christian Ebert <blacktrash@gmx.net>
parents:
3873
diff
changeset
|
5 % should fail |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 abort: no patches applied |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 applying a.patch |
7627 | 8 now at: a.patch |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 % should guard a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 % should print +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 a.patch: +a |
7627 | 12 patch queue now empty |
7398
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
13 % should fail |
2cd1308cb588
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)
Brendan Cully <brendan@kublai.com>
parents:
6607
diff
changeset
|
14 cannot push 'a.patch' - guarded by ['+a'] |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 a.patch: +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 % should push b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 applying b.patch |
7627 | 18 now at: b.patch |
19 patch queue now empty | |
6607
75b506f0e571
mq: make qselect fail properly on an empty guard
Patrick Mezard <pmezard@gmail.com>
parents:
4405
diff
changeset
|
20 % test selection of an empty guard |
75b506f0e571
mq: make qselect fail properly on an empty guard
Patrick Mezard <pmezard@gmail.com>
parents:
4405
diff
changeset
|
21 abort: guard cannot be an empty string |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
22 number of unguarded, unapplied patches has changed from 2 to 3 |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 % should push a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 applying a.patch |
7627 | 25 now at: a.patch |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 % should print -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 c.patch: -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 % should skip c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 applying b.patch |
3873
a41b01a3c29f
Fix test output for test-mq-guards (changed by 22d18051f9e5)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3763
diff
changeset
|
30 skipping c.patch - guarded by '-a' |
7627 | 31 now at: b.patch |
4405
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
32 % should display b.patch |
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
33 b.patch |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 % should push c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 applying c.patch |
7627 | 36 now at: c.patch |
37 patch queue now empty | |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 guards deactivated |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
39 number of unguarded, unapplied patches has changed from 3 to 2 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
40 % should push all |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 applying b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
42 applying c.patch |
7627 | 43 now at: c.patch |
44 patch queue now empty | |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
45 number of unguarded, unapplied patches has changed from 1 to 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
46 % should push a.patch, not b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
47 applying a.patch |
7627 | 48 now at: a.patch |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
49 applying c.patch |
7627 | 50 now at: c.patch |
51 patch queue now empty | |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
52 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
53 applying b.patch |
7627 | 54 now at: b.patch |
4340
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
55 applying c.patch |
7627 | 56 now at: c.patch |
4340
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
57 c.patch |
7627 | 58 patch queue now empty |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
59 number of unguarded, unapplied patches has changed from 2 to 3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
60 % should push a.patch, b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
61 applying a.patch |
7627 | 62 now at: a.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
63 applying b.patch |
7627 | 64 now at: b.patch |
65 patch queue now empty | |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
66 number of unguarded, unapplied patches has changed from 3 to 2 |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
67 % list patches and guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
68 a.patch: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
69 b.patch: +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
70 c.patch: unguarded |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
71 % list series |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
72 0 G a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
73 1 U b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
74 2 U c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
75 % list guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
76 1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
77 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
78 3 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
79 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
80 applying b.patch |
7627 | 81 now at: b.patch |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
82 applying c.patch |
7627 | 83 now at: c.patch |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
84 guards deactivated |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
85 popping guarded patches |
7627 | 86 patch queue now empty |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
87 reapplying unguarded patches |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
88 applying c.patch |
7627 | 89 now at: c.patch |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
90 % guards in series file: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
91 +1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
92 +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
93 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
94 % should show c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
95 c.patch |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
96 % should show : |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
97 % new.patch: +1 +2 -3 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
98 % b.patch: +2 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
99 % c.patch: unguarded |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
100 new.patch: +1 +2 -3 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
101 b.patch: +2 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
102 c.patch: unguarded |
7627 | 103 now at: c.patch |
3763
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
104 % should show new.patch and b.patch as Guarded, c.patch as Applied |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
105 % and d.patch as Unapplied |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
106 0 G new.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
107 1 G b.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
108 2 A c.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
109 3 U d.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
110 % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded. |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
111 0 G new.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
112 1 G b.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
113 2 A c.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
114 3 G d.patch |
7627 | 115 patch queue now empty |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
116 new.patch: +1 +2 -3 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
117 b.patch: +2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
118 c.patch: unguarded |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
119 d.patch: +2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
120 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
121 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
122 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
123 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
124 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
125 0 G new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
126 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
127 2 U c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
128 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
129 number of unguarded, unapplied patches has changed from 1 to 2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
130 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
131 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
132 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
133 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
134 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
135 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
136 0 U new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
137 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
138 2 U c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
139 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
140 applying new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
141 skipping b.patch - guarded by ['+2'] |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
142 applying c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
143 skipping d.patch - guarded by ['+2'] |
7627 | 144 now at: c.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
145 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
146 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
147 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
148 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
149 0 A new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
150 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
151 2 A c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
152 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
153 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
154 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
155 number of unguarded, unapplied patches has changed from 0 to 1 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
156 number of guarded, applied patches has changed from 1 to 0 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
157 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
158 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
159 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
160 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
161 0 A new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
162 1 U b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
163 2 A c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
164 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
165 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
166 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
167 3 U d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
168 % hg qapplied new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
169 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
170 % hg qunapplied new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
171 b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
172 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
173 % hg qapplied b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
174 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
175 % hg qunapplied b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
176 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
177 % hg qapplied c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
178 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
179 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
180 % hg qunapplied c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
181 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
182 % hg qapplied d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
183 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
184 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
185 % hg qunapplied d.patch |
4241
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
186 % hg qseries -m: only b.patch should be shown |
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
187 the guards file was not ignored in the past |
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
188 b.patch |