equal
deleted
inserted
replaced
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 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 |
37 % should push b.patch |
44 % should push b.patch |
38 applying b.patch |
45 applying b.patch |
39 Now at: b.patch |
46 Now at: b.patch |
40 Patch queue now empty |
47 Patch queue now empty |
|
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 |
41 applying b.patch |
52 applying b.patch |
42 Now at: b.patch |
53 Now at: b.patch |
43 Patch queue now empty |
54 Patch queue now empty |
44 number of unguarded, unapplied patches has changed from 2 to 3 |
|
45 % should push a.patch |
|
46 applying a.patch |
|
47 Now at: a.patch |
|
48 Patch queue now empty |
|
49 number of unguarded, unapplied patches has changed from 3 to 2 |
55 number of unguarded, unapplied patches has changed from 3 to 2 |
|
56 % list patches and guards |
|
57 a.patch: +1 +2 -3 |
|
58 b.patch: +2 |
|
59 c.patch: unguarded |
|
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 |
50 % should push b.patch |
68 % should push b.patch |
51 applying b.patch |
69 applying b.patch |
52 Now at: b.patch |
70 Now at: b.patch |
53 applying c.patch |
71 applying c.patch |
54 Now at: c.patch |
72 Now at: c.patch |
55 guards deactivated |
73 guards deactivated |
56 popping guarded patches |
74 popping guarded patches |
57 Patch queue now empty |
75 Patch queue now empty |
58 reapplying unguarded patches |
76 reapplying unguarded patches |
59 applying b.patch |
|
60 applying c.patch |
77 applying c.patch |
61 Now at: 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 |