Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-guards.out @ 2899:bee4b7abcb01
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Aug 2006 14:42:15 -0500 |
parents | 851b07ec450c |
children | 193e9c6d1a6d |
comparison
equal
deleted
inserted
replaced
2898:06c05c675a35 | 2899:bee4b7abcb01 |
---|---|
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 | 37 number of unguarded, unapplied patches has changed from 1 to 2 |
38 % should push a.patch, not b.patch | |
39 applying a.patch | |
40 Now at: a.patch | |
41 applying c.patch | |
42 Now at: c.patch | |
43 Patch queue now empty | |
38 % should push b.patch | 44 % should push b.patch |
39 applying b.patch | 45 applying b.patch |
40 Now at: b.patch | 46 Now at: b.patch |
41 Patch queue now empty | 47 Patch queue now empty |
42 2 of 3 unapplied patches active | 48 number of unguarded, unapplied patches has changed from 2 to 3 |
49 % should push a.patch, b.patch | |
50 applying a.patch | |
51 Now at: a.patch | |
43 applying b.patch | 52 applying b.patch |
44 Now at: b.patch | 53 Now at: b.patch |
45 Patch queue now empty | 54 Patch queue now empty |
46 3 of 3 unapplied patches active | 55 number of unguarded, unapplied patches has changed from 3 to 2 |
47 % should push a.patch | 56 % list patches and guards |
48 applying a.patch | 57 a.patch: +1 +2 -3 |
49 Now at: a.patch | 58 b.patch: +2 |
50 Patch queue now empty | 59 c.patch: unguarded |
51 2 of 3 unapplied patches active | 60 % list series |
61 0 G a.patch | |
62 1 U b.patch | |
63 2 U c.patch | |
64 % list guards | |
65 1 | |
66 2 | |
67 3 | |
52 % should push b.patch | 68 % should push b.patch |
53 applying b.patch | 69 applying b.patch |
54 Now at: b.patch | 70 Now at: b.patch |
71 applying c.patch | |
72 Now at: c.patch | |
73 guards deactivated | |
74 popping guarded patches | |
75 Patch queue now empty | |
76 reapplying unguarded patches | |
77 applying c.patch | |
78 Now at: c.patch | |
79 % guards in series file: +1 +2 -3 | |
80 +1 | |
81 +2 | |
82 -3 | |
83 % should show c.patch | |
84 c.patch |