test-mq-guards.out
188 lines
| 3.6 KiB
| text/plain
|
TextLexer
/ tests / test-mq-guards.out
Vadim Gelfer
|
r2826 | adding x | ||
Martin Geisler
|
r7627 | patch queue now empty | ||
Vadim Gelfer
|
r2826 | % should fail | ||
Christian Ebert
|
r4133 | abort: no patch named does-not-exist.patch | ||
% should fail | ||||
Vadim Gelfer
|
r2826 | abort: no patches applied | ||
applying a.patch | ||||
Martin Geisler
|
r7627 | now at: a.patch | ||
Vadim Gelfer
|
r2826 | % should guard a.patch | ||
% should print +a | ||||
a.patch: +a | ||||
Martin Geisler
|
r7627 | patch queue now empty | ||
Brendan Cully
|
r7398 | % should fail | ||
cannot push 'a.patch' - guarded by ['+a'] | ||||
Vadim Gelfer
|
r2826 | a.patch: +a | ||
% should push b.patch | ||||
applying b.patch | ||||
Martin Geisler
|
r7627 | now at: b.patch | ||
patch queue now empty | ||||
Patrick Mezard
|
r6607 | % test selection of an empty guard | ||
abort: guard cannot be an empty string | ||||
Vadim Gelfer
|
r2844 | number of unguarded, unapplied patches has changed from 2 to 3 | ||
Vadim Gelfer
|
r2826 | % should push a.patch | ||
applying a.patch | ||||
Martin Geisler
|
r7627 | now at: a.patch | ||
Vadim Gelfer
|
r2826 | % should print -a | ||
c.patch: -a | ||||
% should skip c.patch | ||||
applying b.patch | ||||
Thomas Arendsen Hein
|
r3873 | skipping c.patch - guarded by '-a' | ||
Martin Geisler
|
r7627 | now at: b.patch | ||
Patrick Mezard
|
r4405 | % should display b.patch | ||
b.patch | ||||
Vadim Gelfer
|
r2826 | % should push c.patch | ||
applying c.patch | ||||
Martin Geisler
|
r7627 | now at: c.patch | ||
patch queue now empty | ||||
Vadim Gelfer
|
r2826 | guards deactivated | ||
Vadim Gelfer
|
r2844 | number of unguarded, unapplied patches has changed from 3 to 2 | ||
Vadim Gelfer
|
r2829 | % should push all | ||
Vadim Gelfer
|
r2826 | applying b.patch | ||
applying c.patch | ||||
Martin Geisler
|
r7627 | now at: c.patch | ||
patch queue now empty | ||||
Vadim Gelfer
|
r2850 | number of unguarded, unapplied patches has changed from 1 to 2 | ||
% should push a.patch, not b.patch | ||||
applying a.patch | ||||
Martin Geisler
|
r7627 | now at: a.patch | ||
Vadim Gelfer
|
r2850 | applying c.patch | ||
Martin Geisler
|
r7627 | now at: c.patch | ||
patch queue now empty | ||||
Vadim Gelfer
|
r2829 | % should push b.patch | ||
applying b.patch | ||||
Martin Geisler
|
r7627 | now at: b.patch | ||
Patrick Mezard
|
r4340 | applying c.patch | ||
Martin Geisler
|
r7627 | now at: c.patch | ||
Patrick Mezard
|
r4340 | c.patch | ||
Martin Geisler
|
r7627 | patch queue now empty | ||
Vadim Gelfer
|
r2850 | number of unguarded, unapplied patches has changed from 2 to 3 | ||
% should push a.patch, b.patch | ||||
applying a.patch | ||||
Martin Geisler
|
r7627 | now at: a.patch | ||
Vadim Gelfer
|
r2829 | applying b.patch | ||
Martin Geisler
|
r7627 | now at: b.patch | ||
patch queue now empty | ||||
Vadim Gelfer
|
r2844 | number of unguarded, unapplied patches has changed from 3 to 2 | ||
Vadim Gelfer
|
r2850 | % list patches and guards | ||
a.patch: +1 +2 -3 | ||||
b.patch: +2 | ||||
c.patch: unguarded | ||||
% list series | ||||
0 G a.patch | ||||
1 U b.patch | ||||
2 U c.patch | ||||
% list guards | ||||
1 | ||||
2 | ||||
3 | ||||
Vadim Gelfer
|
r2829 | % should push b.patch | ||
applying b.patch | ||||
Martin Geisler
|
r7627 | now at: b.patch | ||
Vadim Gelfer
|
r2844 | applying c.patch | ||
Martin Geisler
|
r7627 | now at: c.patch | ||
Vadim Gelfer
|
r2844 | guards deactivated | ||
popping guarded patches | ||||
Martin Geisler
|
r7627 | patch queue now empty | ||
Vadim Gelfer
|
r2844 | reapplying unguarded patches | ||
applying c.patch | ||||
Martin Geisler
|
r7627 | now at: c.patch | ||
Vadim Gelfer
|
r2850 | % guards in series file: +1 +2 -3 | ||
+1 | ||||
+2 | ||||
-3 | ||||
% should show c.patch | ||||
c.patch | ||||
Mathieu Clabaut
|
r3685 | % should show : | ||
% new.patch: +1 +2 -3 | ||||
% b.patch: +2 | ||||
% c.patch: unguarded | ||||
new.patch: +1 +2 -3 | ||||
b.patch: +2 | ||||
c.patch: unguarded | ||||
Martin Geisler
|
r7627 | now at: c.patch | ||
Alexis S. L. Carvalho
|
r3763 | % should show new.patch and b.patch as Guarded, c.patch as Applied | ||
% and d.patch as Unapplied | ||||
0 G new.patch | ||||
1 G b.patch | ||||
2 A c.patch | ||||
3 U d.patch | ||||
% new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded. | ||||
0 G new.patch | ||||
1 G b.patch | ||||
2 A c.patch | ||||
3 G d.patch | ||||
Martin Geisler
|
r7627 | patch queue now empty | ||
Thomas Arendsen Hein
|
r4240 | new.patch: +1 +2 -3 | ||
b.patch: +2 | ||||
c.patch: unguarded | ||||
d.patch: +2 | ||||
% hg qapplied | ||||
% hg qapplied -v | ||||
% hg qunapplied | ||||
c.patch | ||||
% hg qunapplied -v | ||||
0 G new.patch | ||||
1 G b.patch | ||||
2 U c.patch | ||||
3 G d.patch | ||||
number of unguarded, unapplied patches has changed from 1 to 2 | ||||
% hg qapplied | ||||
% hg qapplied -v | ||||
% hg qunapplied | ||||
new.patch | ||||
c.patch | ||||
% hg qunapplied -v | ||||
0 U new.patch | ||||
1 G b.patch | ||||
2 U c.patch | ||||
3 G d.patch | ||||
applying new.patch | ||||
skipping b.patch - guarded by ['+2'] | ||||
applying c.patch | ||||
skipping d.patch - guarded by ['+2'] | ||||
Martin Geisler
|
r7627 | now at: c.patch | ||
Thomas Arendsen Hein
|
r4240 | % hg qapplied | ||
new.patch | ||||
c.patch | ||||
% hg qapplied -v | ||||
0 A new.patch | ||||
1 G b.patch | ||||
2 A c.patch | ||||
% hg qunapplied | ||||
% hg qunapplied -v | ||||
3 G d.patch | ||||
number of unguarded, unapplied patches has changed from 0 to 1 | ||||
number of guarded, applied patches has changed from 1 to 0 | ||||
% hg qapplied | ||||
new.patch | ||||
c.patch | ||||
% hg qapplied -v | ||||
0 A new.patch | ||||
1 U b.patch | ||||
2 A c.patch | ||||
% hg qunapplied | ||||
d.patch | ||||
% hg qunapplied -v | ||||
3 U d.patch | ||||
% hg qapplied new.patch | ||||
new.patch | ||||
% hg qunapplied new.patch | ||||
b.patch | ||||
d.patch | ||||
% hg qapplied b.patch | ||||
new.patch | ||||
% hg qunapplied b.patch | ||||
d.patch | ||||
% hg qapplied c.patch | ||||
new.patch | ||||
c.patch | ||||
% hg qunapplied c.patch | ||||
d.patch | ||||
% hg qapplied d.patch | ||||
new.patch | ||||
c.patch | ||||
% hg qunapplied d.patch | ||||
Thomas Arendsen Hein
|
r4241 | % hg qseries -m: only b.patch should be shown | ||
the guards file was not ignored in the past | ||||
b.patch | ||||