equal
deleted
inserted
replaced
61 hg qselect -n |
61 hg qselect -n |
62 echo % should push all |
62 echo % should push all |
63 hg qpush -a |
63 hg qpush -a |
64 |
64 |
65 hg qpop -a |
65 hg qpop -a |
66 hg qguard a.patch +1 +2 |
66 hg qguard a.patch +1 |
|
67 hg qguard b.patch +2 |
67 hg qselect 1 |
68 hg qselect 1 |
|
69 echo % should push a.patch, not b.patch |
|
70 hg qpush |
|
71 hg qpush |
|
72 hg qpop -a |
|
73 |
|
74 hg qselect 2 |
68 echo % should push b.patch |
75 echo % should push b.patch |
69 hg qpush |
76 hg qpush |
70 hg qpop -a |
77 hg qpop -a |
71 |
78 |
72 hg qselect 2 |
79 hg qselect 1 2 |
|
80 echo % should push a.patch, b.patch |
73 hg qpush |
81 hg qpush |
74 hg qpop -a |
|
75 |
|
76 hg qselect 1 2 |
|
77 echo % should push a.patch |
|
78 hg qpush |
82 hg qpush |
79 hg qpop -a |
83 hg qpop -a |
80 |
84 |
81 hg qguard a.patch +1 +2 -3 |
85 hg qguard a.patch +1 +2 -3 |
82 hg qselect 1 2 3 |
86 hg qselect 1 2 3 |
|
87 echo % list patches and guards |
|
88 hg qguard -l |
|
89 echo % list series |
|
90 hg qseries -v |
|
91 echo % list guards |
|
92 hg qselect |
83 echo % should push b.patch |
93 echo % should push b.patch |
84 hg qpush |
94 hg qpush |
85 |
95 |
86 hg qpush -a |
96 hg qpush -a |
87 hg qselect -n --reapply |
97 hg qselect -n --reapply |
|
98 echo % guards in series file: +1 +2 -3 |
|
99 hg qselect -s |
|
100 echo % should show c.patch |
|
101 hg qapplied |