Show More
| This diff has been collapsed as it changes many lines, (1054 lines changed) Show them Hide them | |||||
| @@ -1,151 +1,969 b'' | |||||
| 1 | #!/bin/sh |
|
|||
| 2 |
|
||||
| 3 | echo "[extensions]" >> $HGRCPATH |
|
|||
| 4 | echo "mq=" >> $HGRCPATH |
|
|||
| 5 | echo "[diff]" >> $HGRCPATH |
|
|||
| 6 | echo "nodates=true" >> $HGRCPATH |
|
|||
| 7 |
|
||||
| 8 |
|
||||
| 9 | catlog() { |
|
|||
| 10 | cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ |
|
|||
| 11 | -e "s/^\(# Parent \).*/\1/" |
|
|||
| 12 | hg log --template "{rev}: {desc} - {author}\n" |
|
|||
| 13 | } |
|
|||
| 14 |
|
1 | |||
| 15 | runtest() { |
|
2 | $ echo "[extensions]" >> $HGRCPATH | |
| 16 | echo ==== init |
|
3 | $ echo "mq=" >> $HGRCPATH | |
| 17 | hg init a |
|
4 | $ echo "[diff]" >> $HGRCPATH | |
| 18 | cd a |
|
5 | $ echo "nodates=true" >> $HGRCPATH | |
| 19 | hg qinit |
|
6 | $ catlog() { | |
| 20 |
|
7 | > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ | ||
|
|
8 | > -e "s/^\(# Parent \).*/\1/" | |||
|
|
9 | > hg log --template "{rev}: {desc} - {author}\n" | |||
|
|
10 | > } | |||
|
|
11 | $ runtest() { | |||
|
|
12 | > echo ==== init | |||
|
|
13 | > hg init a | |||
|
|
14 | > cd a | |||
|
|
15 | > hg qinit | |||
|
|
16 | > | |||
|
|
17 | > | |||
|
|
18 | > echo ==== qnew -U | |||
|
|
19 | > hg qnew -U 1.patch | |||
|
|
20 | > catlog 1 | |||
|
|
21 | > | |||
|
|
22 | > echo ==== qref | |||
|
|
23 | > echo "1" >1 | |||
|
|
24 | > hg add | |||
|
|
25 | > hg qref | |||
|
|
26 | > catlog 1 | |||
|
|
27 | > | |||
|
|
28 | > echo ==== qref -u | |||
|
|
29 | > hg qref -u mary | |||
|
|
30 | > catlog 1 | |||
|
|
31 | > | |||
|
|
32 | > echo ==== qnew | |||
|
|
33 | > hg qnew 2.patch | |||
|
|
34 | > echo "2" >2 | |||
|
|
35 | > hg add | |||
|
|
36 | > hg qref | |||
|
|
37 | > catlog 2 | |||
|
|
38 | > | |||
|
|
39 | > echo ==== qref -u | |||
|
|
40 | > hg qref -u jane | |||
|
|
41 | > catlog 2 | |||
|
|
42 | > | |||
|
|
43 | > | |||
|
|
44 | > echo ==== qnew -U -m | |||
|
|
45 | > hg qnew -U -m "Three" 3.patch | |||
|
|
46 | > catlog 3 | |||
|
|
47 | > | |||
|
|
48 | > echo ==== qref | |||
|
|
49 | > echo "3" >3 | |||
|
|
50 | > hg add | |||
|
|
51 | > hg qref | |||
|
|
52 | > catlog 3 | |||
|
|
53 | > | |||
|
|
54 | > echo ==== qref -m | |||
|
|
55 | > hg qref -m "Drei" | |||
|
|
56 | > catlog 3 | |||
|
|
57 | > | |||
|
|
58 | > echo ==== qref -u | |||
|
|
59 | > hg qref -u mary | |||
|
|
60 | > catlog 3 | |||
|
|
61 | > | |||
|
|
62 | > echo ==== qref -u -m | |||
|
|
63 | > hg qref -u maria -m "Three (again)" | |||
|
|
64 | > catlog 3 | |||
|
|
65 | > | |||
|
|
66 | > echo ==== qnew -m | |||
|
|
67 | > hg qnew -m "Four" 4.patch | |||
|
|
68 | > echo "4" >4of t | |||
|
|
69 | > hg add | |||
|
|
70 | > hg qref | |||
|
|
71 | > catlog 4 | |||
|
|
72 | > | |||
|
|
73 | > echo ==== qref -u | |||
|
|
74 | > hg qref -u jane | |||
|
|
75 | > catlog 4 | |||
|
|
76 | > | |||
|
|
77 | > | |||
|
|
78 | > echo ==== qnew with HG header | |||
|
|
79 | > hg qnew --config 'mq.plain=true' 5.patch | |||
|
|
80 | > hg qpop | |||
|
|
81 | > echo "# HG changeset patch" >>.hg/patches/5.patch | |||
|
|
82 | > echo "# User johndoe" >>.hg/patches/5.patch | |||
|
|
83 | > hg qpush 2>&1 | grep 'now at' | |||
|
|
84 | > catlog 5 | |||
|
|
85 | > | |||
|
|
86 | > echo ==== hg qref | |||
|
|
87 | > echo "5" >5 | |||
|
|
88 | > hg add | |||
|
|
89 | > hg qref | |||
|
|
90 | > catlog 5 | |||
|
|
91 | > | |||
|
|
92 | > echo ==== hg qref -U | |||
|
|
93 | > hg qref -U | |||
|
|
94 | > catlog 5 | |||
|
|
95 | > | |||
|
|
96 | > echo ==== hg qref -u | |||
|
|
97 | > hg qref -u johndeere | |||
|
|
98 | > catlog 5 | |||
|
|
99 | > | |||
|
|
100 | > | |||
|
|
101 | > echo ==== qnew with plain header | |||
|
|
102 | > hg qnew --config 'mq.plain=true' -U 6.patch | |||
|
|
103 | > hg qpop | |||
|
|
104 | > hg qpush 2>&1 | grep 'now at' | |||
|
|
105 | > catlog 6 | |||
|
|
106 | > | |||
|
|
107 | > echo ==== hg qref | |||
|
|
108 | > echo "6" >6 | |||
|
|
109 | > hg add | |||
|
|
110 | > hg qref | |||
|
|
111 | > catlog 6 | |||
|
|
112 | > | |||
|
|
113 | > echo ==== hg qref -U | |||
|
|
114 | > hg qref -U | |||
|
|
115 | > catlog 6 | |||
|
|
116 | > | |||
|
|
117 | > echo ==== hg qref -u | |||
|
|
118 | > hg qref -u johndeere | |||
|
|
119 | > catlog 6 | |||
|
|
120 | > | |||
|
|
121 | > | |||
|
|
122 | > echo ==== "qpop -a / qpush -a" | |||
|
|
123 | > hg qpop -a | |||
|
|
124 | > hg qpush -a | |||
|
|
125 | > hg log --template "{rev}: {desc} - {author}\n" | |||
|
|
126 | > } | |||
| 21 |
|
127 | |||
| 22 | echo ==== qnew -U |
|
128 | ======= plain headers | |
| 23 | hg qnew -U 1.patch |
|
129 | ||
| 24 | catlog 1 |
|
130 | $ echo "[mq]" >> $HGRCPATH | |
|
|
131 | $ echo "plain=true" >> $HGRCPATH | |||
|
|
132 | $ mkdir sandbox | |||
|
|
133 | $ (cd sandbox ; runtest) | |||
|
|
134 | ==== init | |||
|
|
135 | ==== qnew -U | |||
|
|
136 | From: test | |||
|
|
137 | ||||
|
|
138 | 0: [mq]: 1.patch - test | |||
|
|
139 | ==== qref | |||
|
|
140 | adding 1 | |||
|
|
141 | From: test | |||
|
|
142 | ||||
|
|
143 | diff -r ... 1 | |||
|
|
144 | --- /dev/null | |||
|
|
145 | +++ b/1 | |||
|
|
146 | @@ -0,0 +1,1 @@ | |||
|
|
147 | +1 | |||
|
|
148 | 0: [mq]: 1.patch - test | |||
|
|
149 | ==== qref -u | |||
|
|
150 | From: mary | |||
|
|
151 | ||||
|
|
152 | diff -r ... 1 | |||
|
|
153 | --- /dev/null | |||
|
|
154 | +++ b/1 | |||
|
|
155 | @@ -0,0 +1,1 @@ | |||
|
|
156 | +1 | |||
|
|
157 | 0: [mq]: 1.patch - mary | |||
|
|
158 | ==== qnew | |||
|
|
159 | adding 2 | |||
|
|
160 | diff -r ... 2 | |||
|
|
161 | --- /dev/null | |||
|
|
162 | +++ b/2 | |||
|
|
163 | @@ -0,0 +1,1 @@ | |||
|
|
164 | +2 | |||
|
|
165 | 1: [mq]: 2.patch - test | |||
|
|
166 | 0: [mq]: 1.patch - mary | |||
|
|
167 | ==== qref -u | |||
|
|
168 | From: jane | |||
| 25 |
|
169 | |||
| 26 | echo ==== qref |
|
170 | diff -r ... 2 | |
| 27 | echo "1" >1 |
|
171 | --- /dev/null | |
| 28 | hg add |
|
172 | +++ b/2 | |
| 29 | hg qref |
|
173 | @@ -0,0 +1,1 @@ | |
| 30 | catlog 1 |
|
174 | +2 | |
|
|
175 | 1: [mq]: 2.patch - jane | |||
|
|
176 | 0: [mq]: 1.patch - mary | |||
|
|
177 | ==== qnew -U -m | |||
|
|
178 | From: test | |||
|
|
179 | ||||
|
|
180 | Three | |||
|
|
181 | ||||
|
|
182 | 2: Three - test | |||
|
|
183 | 1: [mq]: 2.patch - jane | |||
|
|
184 | 0: [mq]: 1.patch - mary | |||
|
|
185 | ==== qref | |||
|
|
186 | adding 3 | |||
|
|
187 | From: test | |||
|
|
188 | ||||
|
|
189 | Three | |||
| 31 |
|
190 | |||
| 32 | echo ==== qref -u |
|
191 | diff -r ... 3 | |
| 33 | hg qref -u mary |
|
192 | --- /dev/null | |
| 34 | catlog 1 |
|
193 | +++ b/3 | |
|
|
194 | @@ -0,0 +1,1 @@ | |||
|
|
195 | +3 | |||
|
|
196 | 2: Three - test | |||
|
|
197 | 1: [mq]: 2.patch - jane | |||
|
|
198 | 0: [mq]: 1.patch - mary | |||
|
|
199 | ==== qref -m | |||
|
|
200 | From: test | |||
|
|
201 | ||||
|
|
202 | Drei | |||
|
|
203 | ||||
|
|
204 | diff -r ... 3 | |||
|
|
205 | --- /dev/null | |||
|
|
206 | +++ b/3 | |||
|
|
207 | @@ -0,0 +1,1 @@ | |||
|
|
208 | +3 | |||
|
|
209 | 2: Drei - test | |||
|
|
210 | 1: [mq]: 2.patch - jane | |||
|
|
211 | 0: [mq]: 1.patch - mary | |||
|
|
212 | ==== qref -u | |||
|
|
213 | From: mary | |||
|
|
214 | ||||
|
|
215 | Drei | |||
|
|
216 | ||||
|
|
217 | diff -r ... 3 | |||
|
|
218 | --- /dev/null | |||
|
|
219 | +++ b/3 | |||
|
|
220 | @@ -0,0 +1,1 @@ | |||
|
|
221 | +3 | |||
|
|
222 | 2: Drei - mary | |||
|
|
223 | 1: [mq]: 2.patch - jane | |||
|
|
224 | 0: [mq]: 1.patch - mary | |||
|
|
225 | ==== qref -u -m | |||
|
|
226 | From: maria | |||
|
|
227 | ||||
|
|
228 | Three (again) | |||
| 35 |
|
229 | |||
| 36 | echo ==== qnew |
|
230 | diff -r ... 3 | |
| 37 | hg qnew 2.patch |
|
231 | --- /dev/null | |
| 38 | echo "2" >2 |
|
232 | +++ b/3 | |
| 39 | hg add |
|
233 | @@ -0,0 +1,1 @@ | |
| 40 | hg qref |
|
234 | +3 | |
| 41 | catlog 2 |
|
235 | 2: Three (again) - maria | |
|
|
236 | 1: [mq]: 2.patch - jane | |||
|
|
237 | 0: [mq]: 1.patch - mary | |||
|
|
238 | ==== qnew -m | |||
|
|
239 | adding 4of | |||
|
|
240 | Four | |||
|
|
241 | ||||
|
|
242 | diff -r ... 4of | |||
|
|
243 | --- /dev/null | |||
|
|
244 | +++ b/4of | |||
|
|
245 | @@ -0,0 +1,1 @@ | |||
|
|
246 | +4 t | |||
|
|
247 | 3: Four - test | |||
|
|
248 | 2: Three (again) - maria | |||
|
|
249 | 1: [mq]: 2.patch - jane | |||
|
|
250 | 0: [mq]: 1.patch - mary | |||
|
|
251 | ==== qref -u | |||
|
|
252 | From: jane | |||
|
|
253 | Four | |||
|
|
254 | ||||
|
|
255 | diff -r ... 4of | |||
|
|
256 | --- /dev/null | |||
|
|
257 | +++ b/4of | |||
|
|
258 | @@ -0,0 +1,1 @@ | |||
|
|
259 | +4 t | |||
|
|
260 | 3: Four - jane | |||
|
|
261 | 2: Three (again) - maria | |||
|
|
262 | 1: [mq]: 2.patch - jane | |||
|
|
263 | 0: [mq]: 1.patch - mary | |||
|
|
264 | ==== qnew with HG header | |||
|
|
265 | popping 5.patch | |||
|
|
266 | now at: 4.patch | |||
|
|
267 | now at: 5.patch | |||
|
|
268 | # HG changeset patch | |||
|
|
269 | # User johndoe | |||
|
|
270 | 4: imported patch 5.patch - johndoe | |||
|
|
271 | 3: Four - jane | |||
|
|
272 | 2: Three (again) - maria | |||
|
|
273 | 1: [mq]: 2.patch - jane | |||
|
|
274 | 0: [mq]: 1.patch - mary | |||
|
|
275 | ==== hg qref | |||
|
|
276 | adding 5 | |||
|
|
277 | # HG changeset patch | |||
|
|
278 | # Parent | |||
|
|
279 | # User johndoe | |||
| 42 |
|
280 | |||
| 43 | echo ==== qref -u |
|
281 | diff -r ... 5 | |
| 44 | hg qref -u jane |
|
282 | --- /dev/null | |
| 45 | catlog 2 |
|
283 | +++ b/5 | |
|
|
284 | @@ -0,0 +1,1 @@ | |||
|
|
285 | +5 | |||
|
|
286 | 4: [mq]: 5.patch - johndoe | |||
|
|
287 | 3: Four - jane | |||
|
|
288 | 2: Three (again) - maria | |||
|
|
289 | 1: [mq]: 2.patch - jane | |||
|
|
290 | 0: [mq]: 1.patch - mary | |||
|
|
291 | ==== hg qref -U | |||
|
|
292 | # HG changeset patch | |||
|
|
293 | # Parent | |||
|
|
294 | # User test | |||
|
|
295 | ||||
|
|
296 | diff -r ... 5 | |||
|
|
297 | --- /dev/null | |||
|
|
298 | +++ b/5 | |||
|
|
299 | @@ -0,0 +1,1 @@ | |||
|
|
300 | +5 | |||
|
|
301 | 4: [mq]: 5.patch - test | |||
|
|
302 | 3: Four - jane | |||
|
|
303 | 2: Three (again) - maria | |||
|
|
304 | 1: [mq]: 2.patch - jane | |||
|
|
305 | 0: [mq]: 1.patch - mary | |||
|
|
306 | ==== hg qref -u | |||
|
|
307 | # HG changeset patch | |||
|
|
308 | # Parent | |||
|
|
309 | # User johndeere | |||
| 46 |
|
310 | |||
|
|
311 | diff -r ... 5 | |||
|
|
312 | --- /dev/null | |||
|
|
313 | +++ b/5 | |||
|
|
314 | @@ -0,0 +1,1 @@ | |||
|
|
315 | +5 | |||
|
|
316 | 4: [mq]: 5.patch - johndeere | |||
|
|
317 | 3: Four - jane | |||
|
|
318 | 2: Three (again) - maria | |||
|
|
319 | 1: [mq]: 2.patch - jane | |||
|
|
320 | 0: [mq]: 1.patch - mary | |||
|
|
321 | ==== qnew with plain header | |||
|
|
322 | popping 6.patch | |||
|
|
323 | now at: 5.patch | |||
|
|
324 | now at: 6.patch | |||
|
|
325 | From: test | |||
| 47 |
|
326 | |||
| 48 | echo ==== qnew -U -m |
|
327 | 5: imported patch 6.patch - test | |
| 49 | hg qnew -U -m "Three" 3.patch |
|
328 | 4: [mq]: 5.patch - johndeere | |
| 50 | catlog 3 |
|
329 | 3: Four - jane | |
|
|
330 | 2: Three (again) - maria | |||
|
|
331 | 1: [mq]: 2.patch - jane | |||
|
|
332 | 0: [mq]: 1.patch - mary | |||
|
|
333 | ==== hg qref | |||
|
|
334 | adding 6 | |||
|
|
335 | From: test | |||
|
|
336 | ||||
|
|
337 | diff -r ... 6 | |||
|
|
338 | --- /dev/null | |||
|
|
339 | +++ b/6 | |||
|
|
340 | @@ -0,0 +1,1 @@ | |||
|
|
341 | +6 | |||
|
|
342 | 5: [mq]: 6.patch - test | |||
|
|
343 | 4: [mq]: 5.patch - johndeere | |||
|
|
344 | 3: Four - jane | |||
|
|
345 | 2: Three (again) - maria | |||
|
|
346 | 1: [mq]: 2.patch - jane | |||
|
|
347 | 0: [mq]: 1.patch - mary | |||
|
|
348 | ==== hg qref -U | |||
|
|
349 | From: test | |||
| 51 |
|
350 | |||
| 52 | echo ==== qref |
|
351 | diff -r ... 6 | |
| 53 | echo "3" >3 |
|
352 | --- /dev/null | |
| 54 | hg add |
|
353 | +++ b/6 | |
| 55 | hg qref |
|
354 | @@ -0,0 +1,1 @@ | |
| 56 | catlog 3 |
|
355 | +6 | |
|
|
356 | 5: [mq]: 6.patch - test | |||
|
|
357 | 4: [mq]: 5.patch - johndeere | |||
|
|
358 | 3: Four - jane | |||
|
|
359 | 2: Three (again) - maria | |||
|
|
360 | 1: [mq]: 2.patch - jane | |||
|
|
361 | 0: [mq]: 1.patch - mary | |||
|
|
362 | ==== hg qref -u | |||
|
|
363 | From: johndeere | |||
| 57 |
|
364 | |||
| 58 | echo ==== qref -m |
|
365 | diff -r ... 6 | |
| 59 | hg qref -m "Drei" |
|
366 | --- /dev/null | |
| 60 | catlog 3 |
|
367 | +++ b/6 | |
|
|
368 | @@ -0,0 +1,1 @@ | |||
|
|
369 | +6 | |||
|
|
370 | 5: [mq]: 6.patch - johndeere | |||
|
|
371 | 4: [mq]: 5.patch - johndeere | |||
|
|
372 | 3: Four - jane | |||
|
|
373 | 2: Three (again) - maria | |||
|
|
374 | 1: [mq]: 2.patch - jane | |||
|
|
375 | 0: [mq]: 1.patch - mary | |||
|
|
376 | ==== qpop -a / qpush -a | |||
|
|
377 | popping 6.patch | |||
|
|
378 | popping 5.patch | |||
|
|
379 | popping 4.patch | |||
|
|
380 | popping 3.patch | |||
|
|
381 | popping 2.patch | |||
|
|
382 | popping 1.patch | |||
|
|
383 | patch queue now empty | |||
|
|
384 | applying 1.patch | |||
|
|
385 | applying 2.patch | |||
|
|
386 | applying 3.patch | |||
|
|
387 | applying 4.patch | |||
|
|
388 | applying 5.patch | |||
|
|
389 | applying 6.patch | |||
|
|
390 | now at: 6.patch | |||
|
|
391 | 5: imported patch 6.patch - johndeere | |||
|
|
392 | 4: imported patch 5.patch - johndeere | |||
|
|
393 | 3: Four - jane | |||
|
|
394 | 2: Three (again) - maria | |||
|
|
395 | 1: imported patch 2.patch - jane | |||
|
|
396 | 0: imported patch 1.patch - mary | |||
|
|
397 | $ rm -r sandbox | |||
|
|
398 | ||||
|
|
399 | ======= hg headers | |||
| 61 |
|
400 | |||
| 62 | echo ==== qref -u |
|
401 | $ echo "plain=false" >> $HGRCPATH | |
| 63 | hg qref -u mary |
|
402 | $ mkdir sandbox | |
| 64 | catlog 3 |
|
403 | $ (cd sandbox ; runtest) | |
|
|
404 | ==== init | |||
|
|
405 | ==== qnew -U | |||
|
|
406 | # HG changeset patch | |||
|
|
407 | # Parent | |||
|
|
408 | # User test | |||
|
|
409 | 0: [mq]: 1.patch - test | |||
|
|
410 | ==== qref | |||
|
|
411 | adding 1 | |||
|
|
412 | # HG changeset patch | |||
|
|
413 | # Parent | |||
|
|
414 | # User test | |||
|
|
415 | ||||
|
|
416 | diff -r ... 1 | |||
|
|
417 | --- /dev/null | |||
|
|
418 | +++ b/1 | |||
|
|
419 | @@ -0,0 +1,1 @@ | |||
|
|
420 | +1 | |||
|
|
421 | 0: [mq]: 1.patch - test | |||
|
|
422 | ==== qref -u | |||
|
|
423 | # HG changeset patch | |||
|
|
424 | # Parent | |||
|
|
425 | # User mary | |||
| 65 |
|
426 | |||
| 66 | echo ==== qref -u -m |
|
427 | diff -r ... 1 | |
| 67 | hg qref -u maria -m "Three (again)" |
|
428 | --- /dev/null | |
| 68 | catlog 3 |
|
429 | +++ b/1 | |
|
|
430 | @@ -0,0 +1,1 @@ | |||
|
|
431 | +1 | |||
|
|
432 | 0: [mq]: 1.patch - mary | |||
|
|
433 | ==== qnew | |||
|
|
434 | adding 2 | |||
|
|
435 | # HG changeset patch | |||
|
|
436 | # Parent | |||
|
|
437 | ||||
|
|
438 | diff -r ... 2 | |||
|
|
439 | --- /dev/null | |||
|
|
440 | +++ b/2 | |||
|
|
441 | @@ -0,0 +1,1 @@ | |||
|
|
442 | +2 | |||
|
|
443 | 1: [mq]: 2.patch - test | |||
|
|
444 | 0: [mq]: 1.patch - mary | |||
|
|
445 | ==== qref -u | |||
|
|
446 | # HG changeset patch | |||
|
|
447 | # User jane | |||
|
|
448 | # Parent | |||
| 69 |
|
449 | |||
| 70 | echo ==== qnew -m |
|
450 | diff -r ... 2 | |
| 71 | hg qnew -m "Four" 4.patch |
|
451 | --- /dev/null | |
| 72 | echo "4" >4of t |
|
452 | +++ b/2 | |
| 73 | hg add |
|
453 | @@ -0,0 +1,1 @@ | |
| 74 | hg qref |
|
454 | +2 | |
| 75 | catlog 4 |
|
455 | 1: [mq]: 2.patch - jane | |
|
|
456 | 0: [mq]: 1.patch - mary | |||
|
|
457 | ==== qnew -U -m | |||
|
|
458 | # HG changeset patch | |||
|
|
459 | # Parent | |||
|
|
460 | # User test | |||
|
|
461 | Three | |||
|
|
462 | ||||
|
|
463 | 2: Three - test | |||
|
|
464 | 1: [mq]: 2.patch - jane | |||
|
|
465 | 0: [mq]: 1.patch - mary | |||
|
|
466 | ==== qref | |||
|
|
467 | adding 3 | |||
|
|
468 | # HG changeset patch | |||
|
|
469 | # Parent | |||
|
|
470 | # User test | |||
|
|
471 | Three | |||
| 76 |
|
472 | |||
| 77 | echo ==== qref -u |
|
473 | diff -r ... 3 | |
| 78 | hg qref -u jane |
|
474 | --- /dev/null | |
| 79 | catlog 4 |
|
475 | +++ b/3 | |
|
|
476 | @@ -0,0 +1,1 @@ | |||
|
|
477 | +3 | |||
|
|
478 | 2: Three - test | |||
|
|
479 | 1: [mq]: 2.patch - jane | |||
|
|
480 | 0: [mq]: 1.patch - mary | |||
|
|
481 | ==== qref -m | |||
|
|
482 | # HG changeset patch | |||
|
|
483 | # Parent | |||
|
|
484 | # User test | |||
|
|
485 | Drei | |||
|
|
486 | ||||
|
|
487 | diff -r ... 3 | |||
|
|
488 | --- /dev/null | |||
|
|
489 | +++ b/3 | |||
|
|
490 | @@ -0,0 +1,1 @@ | |||
|
|
491 | +3 | |||
|
|
492 | 2: Drei - test | |||
|
|
493 | 1: [mq]: 2.patch - jane | |||
|
|
494 | 0: [mq]: 1.patch - mary | |||
|
|
495 | ==== qref -u | |||
|
|
496 | # HG changeset patch | |||
|
|
497 | # Parent | |||
|
|
498 | # User mary | |||
|
|
499 | Drei | |||
| 80 |
|
500 | |||
|
|
501 | diff -r ... 3 | |||
|
|
502 | --- /dev/null | |||
|
|
503 | +++ b/3 | |||
|
|
504 | @@ -0,0 +1,1 @@ | |||
|
|
505 | +3 | |||
|
|
506 | 2: Drei - mary | |||
|
|
507 | 1: [mq]: 2.patch - jane | |||
|
|
508 | 0: [mq]: 1.patch - mary | |||
|
|
509 | ==== qref -u -m | |||
|
|
510 | # HG changeset patch | |||
|
|
511 | # Parent | |||
|
|
512 | # User maria | |||
|
|
513 | Three (again) | |||
|
|
514 | ||||
|
|
515 | diff -r ... 3 | |||
|
|
516 | --- /dev/null | |||
|
|
517 | +++ b/3 | |||
|
|
518 | @@ -0,0 +1,1 @@ | |||
|
|
519 | +3 | |||
|
|
520 | 2: Three (again) - maria | |||
|
|
521 | 1: [mq]: 2.patch - jane | |||
|
|
522 | 0: [mq]: 1.patch - mary | |||
|
|
523 | ==== qnew -m | |||
|
|
524 | adding 4of | |||
|
|
525 | # HG changeset patch | |||
|
|
526 | # Parent | |||
|
|
527 | Four | |||
| 81 |
|
528 | |||
| 82 | echo ==== qnew with HG header |
|
529 | diff -r ... 4of | |
| 83 | hg qnew --config 'mq.plain=true' 5.patch |
|
530 | --- /dev/null | |
| 84 | hg qpop |
|
531 | +++ b/4of | |
| 85 | echo "# HG changeset patch" >>.hg/patches/5.patch |
|
532 | @@ -0,0 +1,1 @@ | |
| 86 | echo "# User johndoe" >>.hg/patches/5.patch |
|
533 | +4 t | |
| 87 | hg qpush 2>&1 | grep 'now at' |
|
534 | 3: Four - test | |
| 88 | catlog 5 |
|
535 | 2: Three (again) - maria | |
|
|
536 | 1: [mq]: 2.patch - jane | |||
|
|
537 | 0: [mq]: 1.patch - mary | |||
|
|
538 | ==== qref -u | |||
|
|
539 | # HG changeset patch | |||
|
|
540 | # User jane | |||
|
|
541 | # Parent | |||
|
|
542 | Four | |||
|
|
543 | ||||
|
|
544 | diff -r ... 4of | |||
|
|
545 | --- /dev/null | |||
|
|
546 | +++ b/4of | |||
|
|
547 | @@ -0,0 +1,1 @@ | |||
|
|
548 | +4 t | |||
|
|
549 | 3: Four - jane | |||
|
|
550 | 2: Three (again) - maria | |||
|
|
551 | 1: [mq]: 2.patch - jane | |||
|
|
552 | 0: [mq]: 1.patch - mary | |||
|
|
553 | ==== qnew with HG header | |||
|
|
554 | popping 5.patch | |||
|
|
555 | now at: 4.patch | |||
|
|
556 | now at: 5.patch | |||
|
|
557 | # HG changeset patch | |||
|
|
558 | # User johndoe | |||
|
|
559 | 4: imported patch 5.patch - johndoe | |||
|
|
560 | 3: Four - jane | |||
|
|
561 | 2: Three (again) - maria | |||
|
|
562 | 1: [mq]: 2.patch - jane | |||
|
|
563 | 0: [mq]: 1.patch - mary | |||
|
|
564 | ==== hg qref | |||
|
|
565 | adding 5 | |||
|
|
566 | # HG changeset patch | |||
|
|
567 | # Parent | |||
|
|
568 | # User johndoe | |||
|
|
569 | ||||
|
|
570 | diff -r ... 5 | |||
|
|
571 | --- /dev/null | |||
|
|
572 | +++ b/5 | |||
|
|
573 | @@ -0,0 +1,1 @@ | |||
|
|
574 | +5 | |||
|
|
575 | 4: [mq]: 5.patch - johndoe | |||
|
|
576 | 3: Four - jane | |||
|
|
577 | 2: Three (again) - maria | |||
|
|
578 | 1: [mq]: 2.patch - jane | |||
|
|
579 | 0: [mq]: 1.patch - mary | |||
|
|
580 | ==== hg qref -U | |||
|
|
581 | # HG changeset patch | |||
|
|
582 | # Parent | |||
|
|
583 | # User test | |||
| 89 |
|
584 | |||
| 90 | echo ==== hg qref |
|
585 | diff -r ... 5 | |
| 91 | echo "5" >5 |
|
586 | --- /dev/null | |
| 92 | hg add |
|
587 | +++ b/5 | |
| 93 | hg qref |
|
588 | @@ -0,0 +1,1 @@ | |
| 94 | catlog 5 |
|
589 | +5 | |
|
|
590 | 4: [mq]: 5.patch - test | |||
|
|
591 | 3: Four - jane | |||
|
|
592 | 2: Three (again) - maria | |||
|
|
593 | 1: [mq]: 2.patch - jane | |||
|
|
594 | 0: [mq]: 1.patch - mary | |||
|
|
595 | ==== hg qref -u | |||
|
|
596 | # HG changeset patch | |||
|
|
597 | # Parent | |||
|
|
598 | # User johndeere | |||
| 95 |
|
599 | |||
| 96 | echo ==== hg qref -U |
|
600 | diff -r ... 5 | |
| 97 | hg qref -U |
|
601 | --- /dev/null | |
| 98 | catlog 5 |
|
602 | +++ b/5 | |
|
|
603 | @@ -0,0 +1,1 @@ | |||
|
|
604 | +5 | |||
|
|
605 | 4: [mq]: 5.patch - johndeere | |||
|
|
606 | 3: Four - jane | |||
|
|
607 | 2: Three (again) - maria | |||
|
|
608 | 1: [mq]: 2.patch - jane | |||
|
|
609 | 0: [mq]: 1.patch - mary | |||
|
|
610 | ==== qnew with plain header | |||
|
|
611 | popping 6.patch | |||
|
|
612 | now at: 5.patch | |||
|
|
613 | now at: 6.patch | |||
|
|
614 | From: test | |||
|
|
615 | ||||
|
|
616 | 5: imported patch 6.patch - test | |||
|
|
617 | 4: [mq]: 5.patch - johndeere | |||
|
|
618 | 3: Four - jane | |||
|
|
619 | 2: Three (again) - maria | |||
|
|
620 | 1: [mq]: 2.patch - jane | |||
|
|
621 | 0: [mq]: 1.patch - mary | |||
|
|
622 | ==== hg qref | |||
|
|
623 | adding 6 | |||
|
|
624 | From: test | |||
|
|
625 | ||||
|
|
626 | diff -r ... 6 | |||
|
|
627 | --- /dev/null | |||
|
|
628 | +++ b/6 | |||
|
|
629 | @@ -0,0 +1,1 @@ | |||
|
|
630 | +6 | |||
|
|
631 | 5: [mq]: 6.patch - test | |||
|
|
632 | 4: [mq]: 5.patch - johndeere | |||
|
|
633 | 3: Four - jane | |||
|
|
634 | 2: Three (again) - maria | |||
|
|
635 | 1: [mq]: 2.patch - jane | |||
|
|
636 | 0: [mq]: 1.patch - mary | |||
|
|
637 | ==== hg qref -U | |||
|
|
638 | From: test | |||
| 99 |
|
639 | |||
| 100 | echo ==== hg qref -u |
|
640 | diff -r ... 6 | |
| 101 | hg qref -u johndeere |
|
641 | --- /dev/null | |
| 102 | catlog 5 |
|
642 | +++ b/6 | |
| 103 |
|
643 | @@ -0,0 +1,1 @@ | ||
|
|
644 | +6 | |||
|
|
645 | 5: [mq]: 6.patch - test | |||
|
|
646 | 4: [mq]: 5.patch - johndeere | |||
|
|
647 | 3: Four - jane | |||
|
|
648 | 2: Three (again) - maria | |||
|
|
649 | 1: [mq]: 2.patch - jane | |||
|
|
650 | 0: [mq]: 1.patch - mary | |||
|
|
651 | ==== hg qref -u | |||
|
|
652 | From: johndeere | |||
| 104 |
|
653 | |||
| 105 | echo ==== qnew with plain header |
|
654 | diff -r ... 6 | |
| 106 | hg qnew --config 'mq.plain=true' -U 6.patch |
|
655 | --- /dev/null | |
| 107 | hg qpop |
|
656 | +++ b/6 | |
| 108 | hg qpush 2>&1 | grep 'now at' |
|
657 | @@ -0,0 +1,1 @@ | |
| 109 | catlog 6 |
|
658 | +6 | |
|
|
659 | 5: [mq]: 6.patch - johndeere | |||
|
|
660 | 4: [mq]: 5.patch - johndeere | |||
|
|
661 | 3: Four - jane | |||
|
|
662 | 2: Three (again) - maria | |||
|
|
663 | 1: [mq]: 2.patch - jane | |||
|
|
664 | 0: [mq]: 1.patch - mary | |||
|
|
665 | ==== qpop -a / qpush -a | |||
|
|
666 | popping 6.patch | |||
|
|
667 | popping 5.patch | |||
|
|
668 | popping 4.patch | |||
|
|
669 | popping 3.patch | |||
|
|
670 | popping 2.patch | |||
|
|
671 | popping 1.patch | |||
|
|
672 | patch queue now empty | |||
|
|
673 | applying 1.patch | |||
|
|
674 | applying 2.patch | |||
|
|
675 | applying 3.patch | |||
|
|
676 | applying 4.patch | |||
|
|
677 | applying 5.patch | |||
|
|
678 | applying 6.patch | |||
|
|
679 | now at: 6.patch | |||
|
|
680 | 5: imported patch 6.patch - johndeere | |||
|
|
681 | 4: imported patch 5.patch - johndeere | |||
|
|
682 | 3: Four - jane | |||
|
|
683 | 2: Three (again) - maria | |||
|
|
684 | 1: imported patch 2.patch - jane | |||
|
|
685 | 0: imported patch 1.patch - mary | |||
|
|
686 | $ rm -r sandbox | |||
|
|
687 | $ runtest | |||
|
|
688 | ==== init | |||
|
|
689 | ==== qnew -U | |||
|
|
690 | # HG changeset patch | |||
|
|
691 | # Parent | |||
|
|
692 | # User test | |||
|
|
693 | 0: [mq]: 1.patch - test | |||
|
|
694 | ==== qref | |||
|
|
695 | adding 1 | |||
|
|
696 | # HG changeset patch | |||
|
|
697 | # Parent | |||
|
|
698 | # User test | |||
|
|
699 | ||||
|
|
700 | diff -r ... 1 | |||
|
|
701 | --- /dev/null | |||
|
|
702 | +++ b/1 | |||
|
|
703 | @@ -0,0 +1,1 @@ | |||
|
|
704 | +1 | |||
|
|
705 | 0: [mq]: 1.patch - test | |||
|
|
706 | ==== qref -u | |||
|
|
707 | # HG changeset patch | |||
|
|
708 | # Parent | |||
|
|
709 | # User mary | |||
|
|
710 | ||||
|
|
711 | diff -r ... 1 | |||
|
|
712 | --- /dev/null | |||
|
|
713 | +++ b/1 | |||
|
|
714 | @@ -0,0 +1,1 @@ | |||
|
|
715 | +1 | |||
|
|
716 | 0: [mq]: 1.patch - mary | |||
|
|
717 | ==== qnew | |||
|
|
718 | adding 2 | |||
|
|
719 | # HG changeset patch | |||
|
|
720 | # Parent | |||
| 110 |
|
721 | |||
| 111 | echo ==== hg qref |
|
722 | diff -r ... 2 | |
| 112 | echo "6" >6 |
|
723 | --- /dev/null | |
| 113 | hg add |
|
724 | +++ b/2 | |
| 114 | hg qref |
|
725 | @@ -0,0 +1,1 @@ | |
| 115 | catlog 6 |
|
726 | +2 | |
|
|
727 | 1: [mq]: 2.patch - test | |||
|
|
728 | 0: [mq]: 1.patch - mary | |||
|
|
729 | ==== qref -u | |||
|
|
730 | # HG changeset patch | |||
|
|
731 | # User jane | |||
|
|
732 | # Parent | |||
| 116 |
|
733 | |||
| 117 | echo ==== hg qref -U |
|
734 | diff -r ... 2 | |
| 118 | hg qref -U |
|
735 | --- /dev/null | |
| 119 | catlog 6 |
|
736 | +++ b/2 | |
|
|
737 | @@ -0,0 +1,1 @@ | |||
|
|
738 | +2 | |||
|
|
739 | 1: [mq]: 2.patch - jane | |||
|
|
740 | 0: [mq]: 1.patch - mary | |||
|
|
741 | ==== qnew -U -m | |||
|
|
742 | # HG changeset patch | |||
|
|
743 | # Parent | |||
|
|
744 | # User test | |||
|
|
745 | Three | |||
|
|
746 | ||||
|
|
747 | 2: Three - test | |||
|
|
748 | 1: [mq]: 2.patch - jane | |||
|
|
749 | 0: [mq]: 1.patch - mary | |||
|
|
750 | ==== qref | |||
|
|
751 | adding 3 | |||
|
|
752 | # HG changeset patch | |||
|
|
753 | # Parent | |||
|
|
754 | # User test | |||
|
|
755 | Three | |||
|
|
756 | ||||
|
|
757 | diff -r ... 3 | |||
|
|
758 | --- /dev/null | |||
|
|
759 | +++ b/3 | |||
|
|
760 | @@ -0,0 +1,1 @@ | |||
|
|
761 | +3 | |||
|
|
762 | 2: Three - test | |||
|
|
763 | 1: [mq]: 2.patch - jane | |||
|
|
764 | 0: [mq]: 1.patch - mary | |||
|
|
765 | ==== qref -m | |||
|
|
766 | # HG changeset patch | |||
|
|
767 | # Parent | |||
|
|
768 | # User test | |||
|
|
769 | Drei | |||
| 120 |
|
770 | |||
| 121 | echo ==== hg qref -u |
|
771 | diff -r ... 3 | |
| 122 | hg qref -u johndeere |
|
772 | --- /dev/null | |
| 123 | catlog 6 |
|
773 | +++ b/3 | |
|
|
774 | @@ -0,0 +1,1 @@ | |||
|
|
775 | +3 | |||
|
|
776 | 2: Drei - test | |||
|
|
777 | 1: [mq]: 2.patch - jane | |||
|
|
778 | 0: [mq]: 1.patch - mary | |||
|
|
779 | ==== qref -u | |||
|
|
780 | # HG changeset patch | |||
|
|
781 | # Parent | |||
|
|
782 | # User mary | |||
|
|
783 | Drei | |||
| 124 |
|
784 | |||
|
|
785 | diff -r ... 3 | |||
|
|
786 | --- /dev/null | |||
|
|
787 | +++ b/3 | |||
|
|
788 | @@ -0,0 +1,1 @@ | |||
|
|
789 | +3 | |||
|
|
790 | 2: Drei - mary | |||
|
|
791 | 1: [mq]: 2.patch - jane | |||
|
|
792 | 0: [mq]: 1.patch - mary | |||
|
|
793 | ==== qref -u -m | |||
|
|
794 | # HG changeset patch | |||
|
|
795 | # Parent | |||
|
|
796 | # User maria | |||
|
|
797 | Three (again) | |||
| 125 |
|
798 | |||
| 126 | echo ==== "qpop -a / qpush -a" |
|
799 | diff -r ... 3 | |
| 127 | hg qpop -a |
|
800 | --- /dev/null | |
| 128 | hg qpush -a |
|
801 | +++ b/3 | |
| 129 | hg log --template "{rev}: {desc} - {author}\n" |
|
802 | @@ -0,0 +1,1 @@ | |
| 130 | } |
|
803 | +3 | |
|
|
804 | 2: Three (again) - maria | |||
|
|
805 | 1: [mq]: 2.patch - jane | |||
|
|
806 | 0: [mq]: 1.patch - mary | |||
|
|
807 | ==== qnew -m | |||
|
|
808 | adding 4of | |||
|
|
809 | # HG changeset patch | |||
|
|
810 | # Parent | |||
|
|
811 | Four | |||
|
|
812 | ||||
|
|
813 | diff -r ... 4of | |||
|
|
814 | --- /dev/null | |||
|
|
815 | +++ b/4of | |||
|
|
816 | @@ -0,0 +1,1 @@ | |||
|
|
817 | +4 t | |||
|
|
818 | 3: Four - test | |||
|
|
819 | 2: Three (again) - maria | |||
|
|
820 | 1: [mq]: 2.patch - jane | |||
|
|
821 | 0: [mq]: 1.patch - mary | |||
|
|
822 | ==== qref -u | |||
|
|
823 | # HG changeset patch | |||
|
|
824 | # User jane | |||
|
|
825 | # Parent | |||
|
|
826 | Four | |||
| 131 |
|
827 | |||
| 132 |
|
828 | diff -r ... 4of | ||
| 133 | echo ======= plain headers |
|
829 | --- /dev/null | |
|
|
830 | +++ b/4of | |||
|
|
831 | @@ -0,0 +1,1 @@ | |||
|
|
832 | +4 t | |||
|
|
833 | 3: Four - jane | |||
|
|
834 | 2: Three (again) - maria | |||
|
|
835 | 1: [mq]: 2.patch - jane | |||
|
|
836 | 0: [mq]: 1.patch - mary | |||
|
|
837 | ==== qnew with HG header | |||
|
|
838 | popping 5.patch | |||
|
|
839 | now at: 4.patch | |||
|
|
840 | now at: 5.patch | |||
|
|
841 | # HG changeset patch | |||
|
|
842 | # User johndoe | |||
|
|
843 | 4: imported patch 5.patch - johndoe | |||
|
|
844 | 3: Four - jane | |||
|
|
845 | 2: Three (again) - maria | |||
|
|
846 | 1: [mq]: 2.patch - jane | |||
|
|
847 | 0: [mq]: 1.patch - mary | |||
|
|
848 | ==== hg qref | |||
|
|
849 | adding 5 | |||
|
|
850 | # HG changeset patch | |||
|
|
851 | # Parent | |||
|
|
852 | # User johndoe | |||
| 134 |
|
853 | |||
| 135 | echo "[mq]" >> $HGRCPATH |
|
854 | diff -r ... 5 | |
| 136 | echo "plain=true" >> $HGRCPATH |
|
855 | --- /dev/null | |
|
|
856 | +++ b/5 | |||
|
|
857 | @@ -0,0 +1,1 @@ | |||
|
|
858 | +5 | |||
|
|
859 | 4: [mq]: 5.patch - johndoe | |||
|
|
860 | 3: Four - jane | |||
|
|
861 | 2: Three (again) - maria | |||
|
|
862 | 1: [mq]: 2.patch - jane | |||
|
|
863 | 0: [mq]: 1.patch - mary | |||
|
|
864 | ==== hg qref -U | |||
|
|
865 | # HG changeset patch | |||
|
|
866 | # Parent | |||
|
|
867 | # User test | |||
| 137 |
|
868 | |||
| 138 | mkdir sandbox |
|
869 | diff -r ... 5 | |
| 139 | (cd sandbox ; runtest) |
|
870 | --- /dev/null | |
| 140 | rm -r sandbox |
|
871 | +++ b/5 | |
|
|
872 | @@ -0,0 +1,1 @@ | |||
|
|
873 | +5 | |||
|
|
874 | 4: [mq]: 5.patch - test | |||
|
|
875 | 3: Four - jane | |||
|
|
876 | 2: Three (again) - maria | |||
|
|
877 | 1: [mq]: 2.patch - jane | |||
|
|
878 | 0: [mq]: 1.patch - mary | |||
|
|
879 | ==== hg qref -u | |||
|
|
880 | # HG changeset patch | |||
|
|
881 | # Parent | |||
|
|
882 | # User johndeere | |||
| 141 |
|
883 | |||
|
|
884 | diff -r ... 5 | |||
|
|
885 | --- /dev/null | |||
|
|
886 | +++ b/5 | |||
|
|
887 | @@ -0,0 +1,1 @@ | |||
|
|
888 | +5 | |||
|
|
889 | 4: [mq]: 5.patch - johndeere | |||
|
|
890 | 3: Four - jane | |||
|
|
891 | 2: Three (again) - maria | |||
|
|
892 | 1: [mq]: 2.patch - jane | |||
|
|
893 | 0: [mq]: 1.patch - mary | |||
|
|
894 | ==== qnew with plain header | |||
|
|
895 | popping 6.patch | |||
|
|
896 | now at: 5.patch | |||
|
|
897 | now at: 6.patch | |||
|
|
898 | From: test | |||
| 142 |
|
899 | |||
| 143 | echo ======= hg headers |
|
900 | 5: imported patch 6.patch - test | |
|
|
901 | 4: [mq]: 5.patch - johndeere | |||
|
|
902 | 3: Four - jane | |||
|
|
903 | 2: Three (again) - maria | |||
|
|
904 | 1: [mq]: 2.patch - jane | |||
|
|
905 | 0: [mq]: 1.patch - mary | |||
|
|
906 | ==== hg qref | |||
|
|
907 | adding 6 | |||
|
|
908 | From: test | |||
| 144 |
|
909 | |||
| 145 | echo "plain=false" >> $HGRCPATH |
|
910 | diff -r ... 6 | |
|
|
911 | --- /dev/null | |||
|
|
912 | +++ b/6 | |||
|
|
913 | @@ -0,0 +1,1 @@ | |||
|
|
914 | +6 | |||
|
|
915 | 5: [mq]: 6.patch - test | |||
|
|
916 | 4: [mq]: 5.patch - johndeere | |||
|
|
917 | 3: Four - jane | |||
|
|
918 | 2: Three (again) - maria | |||
|
|
919 | 1: [mq]: 2.patch - jane | |||
|
|
920 | 0: [mq]: 1.patch - mary | |||
|
|
921 | ==== hg qref -U | |||
|
|
922 | From: test | |||
| 146 |
|
923 | |||
| 147 | mkdir sandbox |
|
924 | diff -r ... 6 | |
| 148 | (cd sandbox ; runtest) |
|
925 | --- /dev/null | |
| 149 | rm -r sandbox |
|
926 | +++ b/6 | |
|
|
927 | @@ -0,0 +1,1 @@ | |||
|
|
928 | +6 | |||
|
|
929 | 5: [mq]: 6.patch - test | |||
|
|
930 | 4: [mq]: 5.patch - johndeere | |||
|
|
931 | 3: Four - jane | |||
|
|
932 | 2: Three (again) - maria | |||
|
|
933 | 1: [mq]: 2.patch - jane | |||
|
|
934 | 0: [mq]: 1.patch - mary | |||
|
|
935 | ==== hg qref -u | |||
|
|
936 | From: johndeere | |||
| 150 |
|
937 | |||
| 151 | runtest |
|
938 | diff -r ... 6 | |
|
|
939 | --- /dev/null | |||
|
|
940 | +++ b/6 | |||
|
|
941 | @@ -0,0 +1,1 @@ | |||
|
|
942 | +6 | |||
|
|
943 | 5: [mq]: 6.patch - johndeere | |||
|
|
944 | 4: [mq]: 5.patch - johndeere | |||
|
|
945 | 3: Four - jane | |||
|
|
946 | 2: Three (again) - maria | |||
|
|
947 | 1: [mq]: 2.patch - jane | |||
|
|
948 | 0: [mq]: 1.patch - mary | |||
|
|
949 | ==== qpop -a / qpush -a | |||
|
|
950 | popping 6.patch | |||
|
|
951 | popping 5.patch | |||
|
|
952 | popping 4.patch | |||
|
|
953 | popping 3.patch | |||
|
|
954 | popping 2.patch | |||
|
|
955 | popping 1.patch | |||
|
|
956 | patch queue now empty | |||
|
|
957 | applying 1.patch | |||
|
|
958 | applying 2.patch | |||
|
|
959 | applying 3.patch | |||
|
|
960 | applying 4.patch | |||
|
|
961 | applying 5.patch | |||
|
|
962 | applying 6.patch | |||
|
|
963 | now at: 6.patch | |||
|
|
964 | 5: imported patch 6.patch - johndeere | |||
|
|
965 | 4: imported patch 5.patch - johndeere | |||
|
|
966 | 3: Four - jane | |||
|
|
967 | 2: Three (again) - maria | |||
|
|
968 | 1: imported patch 2.patch - jane | |||
|
|
969 | 0: imported patch 1.patch - mary | |||
General Comments 0
You need to be logged in to leave comments.
Login now