Mercurial > hg
annotate tests/test-mq-guards.out @ 4531:b51a8138292a
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 09 Jun 2007 01:04:28 -0300 |
parents | 8369672060b5 |
children | 75b506f0e571 |
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 |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 Patch queue now empty |
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 |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 Now at: a.patch |
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 |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 Patch queue now empty |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 a.patch: +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 % should push b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 applying b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 Now at: b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 Patch queue now empty |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
18 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
|
19 % should push a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 applying a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 Now at: a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 % should print -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 c.patch: -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 % should skip c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 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
|
26 skipping c.patch - guarded by '-a' |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 Now at: b.patch |
4405
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
28 % should display b.patch |
8369672060b5
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com>
parents:
4340
diff
changeset
|
29 b.patch |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 % should push c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
31 applying c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
32 Now at: c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 Patch queue now empty |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 guards deactivated |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
35 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
|
36 % should push all |
2826
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
37 applying b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 applying c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 Now at: c.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
40 Patch queue now empty |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
41 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
|
42 % 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
|
43 applying a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
44 Now at: a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
45 applying c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
46 Now at: c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
47 Patch queue now empty |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
48 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
49 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
50 Now at: b.patch |
4340
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
51 applying c.patch |
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
52 Now at: c.patch |
23068518deca
mq: test qtop with holes in the patch sequence.
Patrick Mezard <pmezard@gmail.com>
parents:
4241
diff
changeset
|
53 c.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
54 Patch queue now empty |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
55 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
|
56 % 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
|
57 applying a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
58 Now at: a.patch |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
59 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
60 Now at: b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
61 Patch queue now empty |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
62 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
|
63 % list patches and guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
64 a.patch: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
65 b.patch: +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
66 c.patch: unguarded |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
67 % list series |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
68 0 G a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
69 1 U b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
70 2 U c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
71 % list guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
72 1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
73 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
74 3 |
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
75 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
76 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2826
diff
changeset
|
77 Now at: b.patch |
2844
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
78 applying c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
79 Now at: c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
80 guards deactivated |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
81 popping guarded patches |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
82 Patch queue now empty |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
83 reapplying unguarded patches |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
84 applying c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2829
diff
changeset
|
85 Now at: c.patch |
2850
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
86 % 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
|
87 +1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
88 +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
89 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
90 % should show c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2844
diff
changeset
|
91 c.patch |
3685
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
92 % should show : |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
93 % new.patch: +1 +2 -3 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
94 % b.patch: +2 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
95 % c.patch: unguarded |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
96 new.patch: +1 +2 -3 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
97 b.patch: +2 |
193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
2850
diff
changeset
|
98 c.patch: unguarded |
3763
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
99 Now at: c.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
100 % 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
|
101 % and d.patch as Unapplied |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
102 0 G new.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
103 1 G b.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
104 2 A c.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
105 3 U d.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
106 % 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
|
107 0 G new.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
108 1 G b.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
109 2 A c.patch |
955475d237fc
fix qseries -v and guards interaction
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3685
diff
changeset
|
110 3 G d.patch |
4240
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
111 Patch queue now empty |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
112 new.patch: +1 +2 -3 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
113 b.patch: +2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
114 c.patch: unguarded |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
115 d.patch: +2 |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
116 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
117 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
118 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
119 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
120 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
121 0 G new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
122 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
123 2 U c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
124 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
125 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
|
126 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
127 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
128 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
129 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
130 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
131 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
132 0 U new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
133 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
134 2 U c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
135 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
136 applying new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
137 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
|
138 applying c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
139 skipping d.patch - guarded by ['+2'] |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
140 Now at: c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
141 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
142 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
143 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
144 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
145 0 A new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
146 1 G b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
147 2 A c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
148 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
149 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
150 3 G d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
151 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
|
152 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
|
153 % hg qapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
154 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
155 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
156 % hg qapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
157 0 A new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
158 1 U b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
159 2 A c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
160 % hg qunapplied |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
161 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
162 % hg qunapplied -v |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
163 3 U d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
164 % hg qapplied new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
165 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
166 % hg qunapplied new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
167 b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
168 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
169 % hg qapplied b.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
170 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
171 % hg qunapplied 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 c.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 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
176 % hg qunapplied c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
177 d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
178 % hg qapplied d.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
179 new.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
180 c.patch |
943f40b4da30
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4133
diff
changeset
|
181 % hg qunapplied d.patch |
4241
7c59ade0f0d6
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4240
diff
changeset
|
182 % 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
|
183 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
|
184 b.patch |