equal
deleted
inserted
replaced
6 |
6 |
7 $ echo 'base' > base |
7 $ echo 'base' > base |
8 $ hg ci -Ambase -d '1 0' |
8 $ hg ci -Ambase -d '1 0' |
9 adding base |
9 adding base |
10 |
10 |
11 $ hg qnew -d '1 0' a |
11 $ hg qnew -d '1 0' pa |
12 $ hg qnew -d '1 0' b |
12 $ hg qnew -d '1 0' pb |
13 $ hg qnew -d '1 0' c |
13 $ hg qnew -d '1 0' pc |
14 |
14 |
15 $ hg qdel |
15 $ hg qdel |
16 abort: qdelete requires at least one revision or patch name |
16 abort: qdelete requires at least one revision or patch name |
17 [255] |
17 [255] |
18 |
18 |
19 $ hg qdel c |
19 $ hg qdel pc |
20 abort: cannot delete applied patch c |
20 abort: cannot delete applied patch pc |
21 [255] |
21 [255] |
22 |
22 |
23 $ hg qpop |
23 $ hg qpop |
24 popping c |
24 popping pc |
25 now at: b |
25 now at: pb |
26 |
26 |
27 Delete the same patch twice in one command (issue2427) |
27 Delete the same patch twice in one command (issue2427) |
28 |
28 |
29 $ hg qdel c c |
29 $ hg qdel pc pc |
30 |
30 |
31 $ hg qseries |
31 $ hg qseries |
32 a |
32 pa |
33 b |
33 pb |
34 |
34 |
35 $ ls .hg/patches |
35 $ ls .hg/patches |
36 a |
36 pa |
37 b |
37 pb |
38 series |
38 series |
39 status |
39 status |
40 |
40 |
41 $ hg qpop |
41 $ hg qpop |
42 popping b |
42 popping pb |
43 now at: a |
43 now at: pa |
44 |
44 |
45 $ hg qdel -k 1 |
45 $ hg qdel -k 1 |
46 |
46 |
47 $ ls .hg/patches |
47 $ ls .hg/patches |
48 a |
48 pa |
49 b |
49 pb |
50 series |
50 series |
51 status |
51 status |
52 |
52 |
53 $ hg qdel -r a |
53 $ hg qdel -r pa |
54 patch a finalized without changeset message |
54 patch pa finalized without changeset message |
55 |
55 |
56 $ hg qapplied |
56 $ hg qapplied |
57 |
57 |
58 $ hg log --template '{rev} {desc}\n' |
58 $ hg log --template '{rev} {desc}\n' |
59 1 [mq]: a |
59 1 [mq]: pa |
60 0 base |
60 0 base |
61 |
61 |
62 $ hg qnew d |
62 $ hg qnew pd |
63 $ hg qnew e |
63 $ hg qnew pe |
64 $ hg qnew f |
64 $ hg qnew pf |
65 |
65 |
66 $ hg qdel -r e |
66 $ hg qdel -r pe |
67 abort: cannot delete revision 3 above applied patches |
67 abort: cannot delete revision 3 above applied patches |
68 [255] |
68 [255] |
69 |
69 |
70 $ hg qdel -r qbase:e |
70 $ hg qdel -r qbase:pe |
71 patch d finalized without changeset message |
71 patch pd finalized without changeset message |
72 patch e finalized without changeset message |
72 patch pe finalized without changeset message |
73 |
73 |
74 $ hg qapplied |
74 $ hg qapplied |
75 f |
75 pf |
76 |
76 |
77 $ hg log --template '{rev} {desc}\n' |
77 $ hg log --template '{rev} {desc}\n' |
78 4 [mq]: f |
78 4 [mq]: pf |
79 3 [mq]: e |
79 3 [mq]: pe |
80 2 [mq]: d |
80 2 [mq]: pd |
81 1 [mq]: a |
81 1 [mq]: pa |
82 0 base |
82 0 base |
83 |
83 |
84 $ cd .. |
84 $ cd .. |
85 |
85 |
86 $ hg init b |
86 $ hg init b |
95 [255] |
95 [255] |
96 |
96 |
97 $ hg qfinish -a |
97 $ hg qfinish -a |
98 no patches applied |
98 no patches applied |
99 |
99 |
100 $ hg qnew -d '1 0' a |
100 $ hg qnew -d '1 0' pa |
101 $ hg qnew -d '1 0' b |
101 $ hg qnew -d '1 0' pb |
102 $ hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date |
102 $ hg qnew pc # XXX fails to apply by /usr/bin/patch if we put a date |
103 |
103 |
104 $ hg qfinish 0 |
104 $ hg qfinish 0 |
105 abort: revision 0 is not managed |
105 abort: revision 0 is not managed |
106 [255] |
106 [255] |
107 |
107 |
108 $ hg qfinish b |
108 $ hg qfinish pb |
109 abort: cannot delete revision 2 above applied patches |
109 abort: cannot delete revision 2 above applied patches |
110 [255] |
110 [255] |
111 |
111 |
112 $ hg qpop |
112 $ hg qpop |
113 popping c |
113 popping pc |
114 now at: b |
114 now at: pb |
115 |
115 |
116 $ hg qfinish -a c |
116 $ hg qfinish -a pc |
117 abort: unknown revision 'c'! |
117 abort: unknown revision 'pc'! |
118 [255] |
118 [255] |
119 |
119 |
120 $ hg qpush |
120 $ hg qpush |
121 applying c |
121 applying pc |
122 patch c is empty |
122 patch pc is empty |
123 now at: c |
123 now at: pc |
124 |
124 |
125 $ hg qfinish qbase:b |
125 $ hg qfinish qbase:pb |
126 patch a finalized without changeset message |
126 patch pa finalized without changeset message |
127 patch b finalized without changeset message |
127 patch pb finalized without changeset message |
128 |
128 |
129 $ hg qapplied |
129 $ hg qapplied |
130 c |
130 pc |
131 |
131 |
132 $ hg log --template '{rev} {desc}\n' |
132 $ hg log --template '{rev} {desc}\n' |
133 3 imported patch c |
133 3 imported patch pc |
134 2 [mq]: b |
134 2 [mq]: pb |
135 1 [mq]: a |
135 1 [mq]: pa |
136 0 base |
136 0 base |
137 |
137 |
138 $ hg qfinish -a c |
138 $ hg qfinish -a pc |
139 patch c finalized without changeset message |
139 patch pc finalized without changeset message |
140 |
140 |
141 $ hg qapplied |
141 $ hg qapplied |
142 |
142 |
143 $ hg log --template '{rev} {desc}\n' |
143 $ hg log --template '{rev} {desc}\n' |
144 3 imported patch c |
144 3 imported patch pc |
145 2 [mq]: b |
145 2 [mq]: pb |
146 1 [mq]: a |
146 1 [mq]: pa |
147 0 base |
147 0 base |
148 |
148 |
149 $ ls .hg/patches |
149 $ ls .hg/patches |
150 series |
150 series |
151 status |
151 status |
175 now at: 3.diff |
175 now at: 3.diff |
176 $ echo next >> base |
176 $ echo next >> base |
177 $ hg qrefresh -d '1 0' |
177 $ hg qrefresh -d '1 0' |
178 $ echo > .hg/patches/series # remove 3.diff from series to confuse mq |
178 $ echo > .hg/patches/series # remove 3.diff from series to confuse mq |
179 $ hg qfinish -a |
179 $ hg qfinish -a |
180 revision c4dd2b624061 refers to unknown patches: 3.diff |
180 revision 47dfa8501675 refers to unknown patches: 3.diff |
181 |
181 |
182 more complex state 'both known and unknown patches |
182 more complex state 'both known and unknown patches |
183 |
183 |
184 $ echo hip >> base |
184 $ echo hip >> base |
185 $ hg qnew -f -d '1 0' -m 4 4.diff |
185 $ hg qnew -f -d '1 0' -m 4 4.diff |
187 $ hg qnew -f -d '1 0' -m 5 5.diff |
187 $ hg qnew -f -d '1 0' -m 5 5.diff |
188 $ echo > .hg/patches/series # remove 4.diff and 5.diff from series to confuse mq |
188 $ echo > .hg/patches/series # remove 4.diff and 5.diff from series to confuse mq |
189 $ echo hup >> base |
189 $ echo hup >> base |
190 $ hg qnew -f -d '1 0' -m 6 6.diff |
190 $ hg qnew -f -d '1 0' -m 6 6.diff |
191 $ hg qfinish -a |
191 $ hg qfinish -a |
192 revision 6fdec4b20ec3 refers to unknown patches: 5.diff |
192 revision 2b1c98802260 refers to unknown patches: 5.diff |
193 revision 2ba51db7ba24 refers to unknown patches: 4.diff |
193 revision 33a6861311c0 refers to unknown patches: 4.diff |
194 |
194 |