Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-guards.out @ 2832:582cbc4392cb
qselect: add --pop, --reapply options
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 14:58:10 -0700 |
parents | 05316bb57d01 |
children | 851b07ec450c |
comparison
equal
deleted
inserted
replaced
2831:0b9ac7dfcf56 | 2832:582cbc4392cb |
---|---|
11 a.patch: +a | 11 a.patch: +a |
12 % should push b.patch | 12 % should push b.patch |
13 applying b.patch | 13 applying b.patch |
14 Now at: b.patch | 14 Now at: b.patch |
15 Patch queue now empty | 15 Patch queue now empty |
16 3 of 3 unapplied patches active | 16 number of unguarded, unapplied patches has changed from 2 to 3 |
17 % should push a.patch | 17 % should push a.patch |
18 applying a.patch | 18 applying a.patch |
19 Now at: a.patch | 19 Now at: a.patch |
20 % should print -a | 20 % should print -a |
21 c.patch: -a | 21 c.patch: -a |
26 % should push c.patch | 26 % should push c.patch |
27 applying c.patch | 27 applying c.patch |
28 Now at: c.patch | 28 Now at: c.patch |
29 Patch queue now empty | 29 Patch queue now empty |
30 guards deactivated | 30 guards deactivated |
31 2 of 3 unapplied patches active | 31 number of unguarded, unapplied patches has changed from 3 to 2 |
32 % should push all | 32 % should push all |
33 applying b.patch | 33 applying b.patch |
34 applying c.patch | 34 applying c.patch |
35 Now at: c.patch | 35 Now at: c.patch |
36 Patch queue now empty | 36 Patch queue now empty |
37 2 of 3 unapplied patches active | |
38 % should push b.patch | 37 % should push b.patch |
39 applying b.patch | 38 applying b.patch |
40 Now at: b.patch | 39 Now at: b.patch |
41 Patch queue now empty | 40 Patch queue now empty |
42 2 of 3 unapplied patches active | |
43 applying b.patch | 41 applying b.patch |
44 Now at: b.patch | 42 Now at: b.patch |
45 Patch queue now empty | 43 Patch queue now empty |
46 3 of 3 unapplied patches active | 44 number of unguarded, unapplied patches has changed from 2 to 3 |
47 % should push a.patch | 45 % should push a.patch |
48 applying a.patch | 46 applying a.patch |
49 Now at: a.patch | 47 Now at: a.patch |
50 Patch queue now empty | 48 Patch queue now empty |
51 2 of 3 unapplied patches active | 49 number of unguarded, unapplied patches has changed from 3 to 2 |
52 % should push b.patch | 50 % should push b.patch |
53 applying b.patch | 51 applying b.patch |
54 Now at: b.patch | 52 Now at: b.patch |
53 applying c.patch | |
54 Now at: c.patch | |
55 guards deactivated | |
56 popping guarded patches | |
57 Patch queue now empty | |
58 reapplying unguarded patches | |
59 applying b.patch | |
60 applying c.patch | |
61 Now at: c.patch |