184 4: [mq]: 5.patch - johndeere |
184 4: [mq]: 5.patch - johndeere |
185 3: Four - jane |
185 3: Four - jane |
186 2: Three (again) - maria |
186 2: Three (again) - maria |
187 1: [mq]: 2.patch - jane |
187 1: [mq]: 2.patch - jane |
188 0: [mq]: 1.patch - mary |
188 0: [mq]: 1.patch - mary |
|
189 ==== qnew with plain header |
|
190 popping 6.patch |
|
191 now at: 5.patch |
|
192 now at: 6.patch |
|
193 From: test |
|
194 |
|
195 5: imported patch 6.patch - test |
|
196 4: [mq]: 5.patch - johndeere |
|
197 3: Four - jane |
|
198 2: Three (again) - maria |
|
199 1: [mq]: 2.patch - jane |
|
200 0: [mq]: 1.patch - mary |
|
201 ==== hg qref |
|
202 adding 6 |
|
203 From: test |
|
204 |
|
205 diff -r ... 6 |
|
206 --- /dev/null |
|
207 +++ b/6 |
|
208 @@ -0,0 +1,1 @@ |
|
209 +6 |
|
210 5: [mq]: 6.patch - test |
|
211 4: [mq]: 5.patch - johndeere |
|
212 3: Four - jane |
|
213 2: Three (again) - maria |
|
214 1: [mq]: 2.patch - jane |
|
215 0: [mq]: 1.patch - mary |
|
216 ==== hg qref -U |
|
217 From: test |
|
218 |
|
219 diff -r ... 6 |
|
220 --- /dev/null |
|
221 +++ b/6 |
|
222 @@ -0,0 +1,1 @@ |
|
223 +6 |
|
224 5: [mq]: 6.patch - test |
|
225 4: [mq]: 5.patch - johndeere |
|
226 3: Four - jane |
|
227 2: Three (again) - maria |
|
228 1: [mq]: 2.patch - jane |
|
229 0: [mq]: 1.patch - mary |
|
230 ==== hg qref -u |
|
231 From: johndeere |
|
232 |
|
233 diff -r ... 6 |
|
234 --- /dev/null |
|
235 +++ b/6 |
|
236 @@ -0,0 +1,1 @@ |
|
237 +6 |
|
238 5: [mq]: 6.patch - johndeere |
|
239 4: [mq]: 5.patch - johndeere |
|
240 3: Four - jane |
|
241 2: Three (again) - maria |
|
242 1: [mq]: 2.patch - jane |
|
243 0: [mq]: 1.patch - mary |
189 ==== qpop -a / qpush -a |
244 ==== qpop -a / qpush -a |
|
245 popping 6.patch |
190 popping 5.patch |
246 popping 5.patch |
191 popping 4.patch |
247 popping 4.patch |
192 popping 3.patch |
248 popping 3.patch |
193 popping 2.patch |
249 popping 2.patch |
194 popping 1.patch |
250 popping 1.patch |
196 applying 1.patch |
252 applying 1.patch |
197 applying 2.patch |
253 applying 2.patch |
198 applying 3.patch |
254 applying 3.patch |
199 applying 4.patch |
255 applying 4.patch |
200 applying 5.patch |
256 applying 5.patch |
201 now at: 5.patch |
257 applying 6.patch |
|
258 now at: 6.patch |
|
259 5: imported patch 6.patch - johndeere |
202 4: imported patch 5.patch - johndeere |
260 4: imported patch 5.patch - johndeere |
203 3: Four - jane |
261 3: Four - jane |
204 2: Three (again) - maria |
262 2: Three (again) - maria |
205 1: imported patch 2.patch - jane |
263 1: imported patch 2.patch - jane |
206 0: imported patch 1.patch - mary |
264 0: imported patch 1.patch - mary |
|
265 ======= hg headers |
|
266 ==== init |
|
267 ==== qnew -U |
|
268 # HG changeset patch |
|
269 # Parent |
|
270 # User test |
|
271 0: [mq]: 1.patch - test |
|
272 ==== qref |
|
273 adding 1 |
|
274 # HG changeset patch |
|
275 # Parent |
|
276 # User test |
|
277 |
|
278 diff -r ... 1 |
|
279 --- /dev/null |
|
280 +++ b/1 |
|
281 @@ -0,0 +1,1 @@ |
|
282 +1 |
|
283 0: [mq]: 1.patch - test |
|
284 ==== qref -u |
|
285 # HG changeset patch |
|
286 # Parent |
|
287 # User mary |
|
288 |
|
289 diff -r ... 1 |
|
290 --- /dev/null |
|
291 +++ b/1 |
|
292 @@ -0,0 +1,1 @@ |
|
293 +1 |
|
294 0: [mq]: 1.patch - mary |
|
295 ==== qnew |
|
296 adding 2 |
|
297 # HG changeset patch |
|
298 # Parent |
|
299 |
|
300 diff -r ... 2 |
|
301 --- /dev/null |
|
302 +++ b/2 |
|
303 @@ -0,0 +1,1 @@ |
|
304 +2 |
|
305 1: [mq]: 2.patch - test |
|
306 0: [mq]: 1.patch - mary |
|
307 ==== qref -u |
|
308 # HG changeset patch |
|
309 # User jane |
|
310 # Parent |
|
311 |
|
312 diff -r ... 2 |
|
313 --- /dev/null |
|
314 +++ b/2 |
|
315 @@ -0,0 +1,1 @@ |
|
316 +2 |
|
317 1: [mq]: 2.patch - jane |
|
318 0: [mq]: 1.patch - mary |
|
319 ==== qnew -U -m |
|
320 # HG changeset patch |
|
321 # Parent |
|
322 # User test |
|
323 Three |
|
324 |
|
325 2: Three - test |
|
326 1: [mq]: 2.patch - jane |
|
327 0: [mq]: 1.patch - mary |
|
328 ==== qref |
|
329 adding 3 |
|
330 # HG changeset patch |
|
331 # Parent |
|
332 # User test |
|
333 Three |
|
334 |
|
335 diff -r ... 3 |
|
336 --- /dev/null |
|
337 +++ b/3 |
|
338 @@ -0,0 +1,1 @@ |
|
339 +3 |
|
340 2: Three - test |
|
341 1: [mq]: 2.patch - jane |
|
342 0: [mq]: 1.patch - mary |
|
343 ==== qref -m |
|
344 # HG changeset patch |
|
345 # Parent |
|
346 # User test |
|
347 Drei |
|
348 |
|
349 diff -r ... 3 |
|
350 --- /dev/null |
|
351 +++ b/3 |
|
352 @@ -0,0 +1,1 @@ |
|
353 +3 |
|
354 2: Drei - test |
|
355 1: [mq]: 2.patch - jane |
|
356 0: [mq]: 1.patch - mary |
|
357 ==== qref -u |
|
358 # HG changeset patch |
|
359 # Parent |
|
360 # User mary |
|
361 Drei |
|
362 |
|
363 diff -r ... 3 |
|
364 --- /dev/null |
|
365 +++ b/3 |
|
366 @@ -0,0 +1,1 @@ |
|
367 +3 |
|
368 2: Drei - mary |
|
369 1: [mq]: 2.patch - jane |
|
370 0: [mq]: 1.patch - mary |
|
371 ==== qref -u -m |
|
372 # HG changeset patch |
|
373 # Parent |
|
374 # User maria |
|
375 Three (again) |
|
376 |
|
377 diff -r ... 3 |
|
378 --- /dev/null |
|
379 +++ b/3 |
|
380 @@ -0,0 +1,1 @@ |
|
381 +3 |
|
382 2: Three (again) - maria |
|
383 1: [mq]: 2.patch - jane |
|
384 0: [mq]: 1.patch - mary |
|
385 ==== qnew -m |
|
386 adding 4of |
|
387 # HG changeset patch |
|
388 # Parent |
|
389 Four |
|
390 |
|
391 diff -r ... 4of |
|
392 --- /dev/null |
|
393 +++ b/4of |
|
394 @@ -0,0 +1,1 @@ |
|
395 +4 t |
|
396 3: Four - test |
|
397 2: Three (again) - maria |
|
398 1: [mq]: 2.patch - jane |
|
399 0: [mq]: 1.patch - mary |
|
400 ==== qref -u |
|
401 # HG changeset patch |
|
402 # User jane |
|
403 # Parent |
|
404 Four |
|
405 |
|
406 diff -r ... 4of |
|
407 --- /dev/null |
|
408 +++ b/4of |
|
409 @@ -0,0 +1,1 @@ |
|
410 +4 t |
|
411 3: Four - jane |
|
412 2: Three (again) - maria |
|
413 1: [mq]: 2.patch - jane |
|
414 0: [mq]: 1.patch - mary |
|
415 ==== qnew with HG header |
|
416 popping 5.patch |
|
417 now at: 4.patch |
|
418 now at: 5.patch |
|
419 # HG changeset patch |
|
420 # User johndoe |
|
421 4: imported patch 5.patch - johndoe |
|
422 3: Four - jane |
|
423 2: Three (again) - maria |
|
424 1: [mq]: 2.patch - jane |
|
425 0: [mq]: 1.patch - mary |
|
426 ==== hg qref |
|
427 adding 5 |
|
428 # HG changeset patch |
|
429 # Parent |
|
430 # User johndoe |
|
431 |
|
432 diff -r ... 5 |
|
433 --- /dev/null |
|
434 +++ b/5 |
|
435 @@ -0,0 +1,1 @@ |
|
436 +5 |
|
437 4: [mq]: 5.patch - johndoe |
|
438 3: Four - jane |
|
439 2: Three (again) - maria |
|
440 1: [mq]: 2.patch - jane |
|
441 0: [mq]: 1.patch - mary |
|
442 ==== hg qref -U |
|
443 # HG changeset patch |
|
444 # Parent |
|
445 # User test |
|
446 |
|
447 diff -r ... 5 |
|
448 --- /dev/null |
|
449 +++ b/5 |
|
450 @@ -0,0 +1,1 @@ |
|
451 +5 |
|
452 4: [mq]: 5.patch - test |
|
453 3: Four - jane |
|
454 2: Three (again) - maria |
|
455 1: [mq]: 2.patch - jane |
|
456 0: [mq]: 1.patch - mary |
|
457 ==== hg qref -u |
|
458 # HG changeset patch |
|
459 # Parent |
|
460 # User johndeere |
|
461 |
|
462 diff -r ... 5 |
|
463 --- /dev/null |
|
464 +++ b/5 |
|
465 @@ -0,0 +1,1 @@ |
|
466 +5 |
|
467 4: [mq]: 5.patch - johndeere |
|
468 3: Four - jane |
|
469 2: Three (again) - maria |
|
470 1: [mq]: 2.patch - jane |
|
471 0: [mq]: 1.patch - mary |
|
472 ==== qnew with plain header |
|
473 popping 6.patch |
|
474 now at: 5.patch |
|
475 now at: 6.patch |
|
476 From: test |
|
477 |
|
478 5: imported patch 6.patch - test |
|
479 4: [mq]: 5.patch - johndeere |
|
480 3: Four - jane |
|
481 2: Three (again) - maria |
|
482 1: [mq]: 2.patch - jane |
|
483 0: [mq]: 1.patch - mary |
|
484 ==== hg qref |
|
485 adding 6 |
|
486 From: test |
|
487 |
|
488 diff -r ... 6 |
|
489 --- /dev/null |
|
490 +++ b/6 |
|
491 @@ -0,0 +1,1 @@ |
|
492 +6 |
|
493 5: [mq]: 6.patch - test |
|
494 4: [mq]: 5.patch - johndeere |
|
495 3: Four - jane |
|
496 2: Three (again) - maria |
|
497 1: [mq]: 2.patch - jane |
|
498 0: [mq]: 1.patch - mary |
|
499 ==== hg qref -U |
|
500 From: test |
|
501 |
|
502 diff -r ... 6 |
|
503 --- /dev/null |
|
504 +++ b/6 |
|
505 @@ -0,0 +1,1 @@ |
|
506 +6 |
|
507 5: [mq]: 6.patch - test |
|
508 4: [mq]: 5.patch - johndeere |
|
509 3: Four - jane |
|
510 2: Three (again) - maria |
|
511 1: [mq]: 2.patch - jane |
|
512 0: [mq]: 1.patch - mary |
|
513 ==== hg qref -u |
|
514 From: johndeere |
|
515 |
|
516 diff -r ... 6 |
|
517 --- /dev/null |
|
518 +++ b/6 |
|
519 @@ -0,0 +1,1 @@ |
|
520 +6 |
|
521 5: [mq]: 6.patch - johndeere |
|
522 4: [mq]: 5.patch - johndeere |
|
523 3: Four - jane |
|
524 2: Three (again) - maria |
|
525 1: [mq]: 2.patch - jane |
|
526 0: [mq]: 1.patch - mary |
|
527 ==== qpop -a / qpush -a |
|
528 popping 6.patch |
|
529 popping 5.patch |
|
530 popping 4.patch |
|
531 popping 3.patch |
|
532 popping 2.patch |
|
533 popping 1.patch |
|
534 patch queue now empty |
|
535 applying 1.patch |
|
536 applying 2.patch |
|
537 applying 3.patch |
|
538 applying 4.patch |
|
539 applying 5.patch |
|
540 applying 6.patch |
|
541 now at: 6.patch |
|
542 5: imported patch 6.patch - johndeere |
|
543 4: imported patch 5.patch - johndeere |
|
544 3: Four - jane |
|
545 2: Three (again) - maria |
|
546 1: imported patch 2.patch - jane |
|
547 0: imported patch 1.patch - mary |
|
548 ==== init |
|
549 ==== qnew -U |
|
550 # HG changeset patch |
|
551 # Parent |
|
552 # User test |
|
553 0: [mq]: 1.patch - test |
|
554 ==== qref |
|
555 adding 1 |
|
556 # HG changeset patch |
|
557 # Parent |
|
558 # User test |
|
559 |
|
560 diff -r ... 1 |
|
561 --- /dev/null |
|
562 +++ b/1 |
|
563 @@ -0,0 +1,1 @@ |
|
564 +1 |
|
565 0: [mq]: 1.patch - test |
|
566 ==== qref -u |
|
567 # HG changeset patch |
|
568 # Parent |
|
569 # User mary |
|
570 |
|
571 diff -r ... 1 |
|
572 --- /dev/null |
|
573 +++ b/1 |
|
574 @@ -0,0 +1,1 @@ |
|
575 +1 |
|
576 0: [mq]: 1.patch - mary |
|
577 ==== qnew |
|
578 adding 2 |
|
579 # HG changeset patch |
|
580 # Parent |
|
581 |
|
582 diff -r ... 2 |
|
583 --- /dev/null |
|
584 +++ b/2 |
|
585 @@ -0,0 +1,1 @@ |
|
586 +2 |
|
587 1: [mq]: 2.patch - test |
|
588 0: [mq]: 1.patch - mary |
|
589 ==== qref -u |
|
590 # HG changeset patch |
|
591 # User jane |
|
592 # Parent |
|
593 |
|
594 diff -r ... 2 |
|
595 --- /dev/null |
|
596 +++ b/2 |
|
597 @@ -0,0 +1,1 @@ |
|
598 +2 |
|
599 1: [mq]: 2.patch - jane |
|
600 0: [mq]: 1.patch - mary |
|
601 ==== qnew -U -m |
|
602 # HG changeset patch |
|
603 # Parent |
|
604 # User test |
|
605 Three |
|
606 |
|
607 2: Three - test |
|
608 1: [mq]: 2.patch - jane |
|
609 0: [mq]: 1.patch - mary |
|
610 ==== qref |
|
611 adding 3 |
|
612 # HG changeset patch |
|
613 # Parent |
|
614 # User test |
|
615 Three |
|
616 |
|
617 diff -r ... 3 |
|
618 --- /dev/null |
|
619 +++ b/3 |
|
620 @@ -0,0 +1,1 @@ |
|
621 +3 |
|
622 2: Three - test |
|
623 1: [mq]: 2.patch - jane |
|
624 0: [mq]: 1.patch - mary |
|
625 ==== qref -m |
|
626 # HG changeset patch |
|
627 # Parent |
|
628 # User test |
|
629 Drei |
|
630 |
|
631 diff -r ... 3 |
|
632 --- /dev/null |
|
633 +++ b/3 |
|
634 @@ -0,0 +1,1 @@ |
|
635 +3 |
|
636 2: Drei - test |
|
637 1: [mq]: 2.patch - jane |
|
638 0: [mq]: 1.patch - mary |
|
639 ==== qref -u |
|
640 # HG changeset patch |
|
641 # Parent |
|
642 # User mary |
|
643 Drei |
|
644 |
|
645 diff -r ... 3 |
|
646 --- /dev/null |
|
647 +++ b/3 |
|
648 @@ -0,0 +1,1 @@ |
|
649 +3 |
|
650 2: Drei - mary |
|
651 1: [mq]: 2.patch - jane |
|
652 0: [mq]: 1.patch - mary |
|
653 ==== qref -u -m |
|
654 # HG changeset patch |
|
655 # Parent |
|
656 # User maria |
|
657 Three (again) |
|
658 |
|
659 diff -r ... 3 |
|
660 --- /dev/null |
|
661 +++ b/3 |
|
662 @@ -0,0 +1,1 @@ |
|
663 +3 |
|
664 2: Three (again) - maria |
|
665 1: [mq]: 2.patch - jane |
|
666 0: [mq]: 1.patch - mary |
|
667 ==== qnew -m |
|
668 adding 4of |
|
669 # HG changeset patch |
|
670 # Parent |
|
671 Four |
|
672 |
|
673 diff -r ... 4of |
|
674 --- /dev/null |
|
675 +++ b/4of |
|
676 @@ -0,0 +1,1 @@ |
|
677 +4 t |
|
678 3: Four - test |
|
679 2: Three (again) - maria |
|
680 1: [mq]: 2.patch - jane |
|
681 0: [mq]: 1.patch - mary |
|
682 ==== qref -u |
|
683 # HG changeset patch |
|
684 # User jane |
|
685 # Parent |
|
686 Four |
|
687 |
|
688 diff -r ... 4of |
|
689 --- /dev/null |
|
690 +++ b/4of |
|
691 @@ -0,0 +1,1 @@ |
|
692 +4 t |
|
693 3: Four - jane |
|
694 2: Three (again) - maria |
|
695 1: [mq]: 2.patch - jane |
|
696 0: [mq]: 1.patch - mary |
|
697 ==== qnew with HG header |
|
698 popping 5.patch |
|
699 now at: 4.patch |
|
700 now at: 5.patch |
|
701 # HG changeset patch |
|
702 # User johndoe |
|
703 4: imported patch 5.patch - johndoe |
|
704 3: Four - jane |
|
705 2: Three (again) - maria |
|
706 1: [mq]: 2.patch - jane |
|
707 0: [mq]: 1.patch - mary |
|
708 ==== hg qref |
|
709 adding 5 |
|
710 # HG changeset patch |
|
711 # Parent |
|
712 # User johndoe |
|
713 |
|
714 diff -r ... 5 |
|
715 --- /dev/null |
|
716 +++ b/5 |
|
717 @@ -0,0 +1,1 @@ |
|
718 +5 |
|
719 4: [mq]: 5.patch - johndoe |
|
720 3: Four - jane |
|
721 2: Three (again) - maria |
|
722 1: [mq]: 2.patch - jane |
|
723 0: [mq]: 1.patch - mary |
|
724 ==== hg qref -U |
|
725 # HG changeset patch |
|
726 # Parent |
|
727 # User test |
|
728 |
|
729 diff -r ... 5 |
|
730 --- /dev/null |
|
731 +++ b/5 |
|
732 @@ -0,0 +1,1 @@ |
|
733 +5 |
|
734 4: [mq]: 5.patch - test |
|
735 3: Four - jane |
|
736 2: Three (again) - maria |
|
737 1: [mq]: 2.patch - jane |
|
738 0: [mq]: 1.patch - mary |
|
739 ==== hg qref -u |
|
740 # HG changeset patch |
|
741 # Parent |
|
742 # User johndeere |
|
743 |
|
744 diff -r ... 5 |
|
745 --- /dev/null |
|
746 +++ b/5 |
|
747 @@ -0,0 +1,1 @@ |
|
748 +5 |
|
749 4: [mq]: 5.patch - johndeere |
|
750 3: Four - jane |
|
751 2: Three (again) - maria |
|
752 1: [mq]: 2.patch - jane |
|
753 0: [mq]: 1.patch - mary |
|
754 ==== qnew with plain header |
|
755 popping 6.patch |
|
756 now at: 5.patch |
|
757 now at: 6.patch |
|
758 From: test |
|
759 |
|
760 5: imported patch 6.patch - test |
|
761 4: [mq]: 5.patch - johndeere |
|
762 3: Four - jane |
|
763 2: Three (again) - maria |
|
764 1: [mq]: 2.patch - jane |
|
765 0: [mq]: 1.patch - mary |
|
766 ==== hg qref |
|
767 adding 6 |
|
768 From: test |
|
769 |
|
770 diff -r ... 6 |
|
771 --- /dev/null |
|
772 +++ b/6 |
|
773 @@ -0,0 +1,1 @@ |
|
774 +6 |
|
775 5: [mq]: 6.patch - test |
|
776 4: [mq]: 5.patch - johndeere |
|
777 3: Four - jane |
|
778 2: Three (again) - maria |
|
779 1: [mq]: 2.patch - jane |
|
780 0: [mq]: 1.patch - mary |
|
781 ==== hg qref -U |
|
782 From: test |
|
783 |
|
784 diff -r ... 6 |
|
785 --- /dev/null |
|
786 +++ b/6 |
|
787 @@ -0,0 +1,1 @@ |
|
788 +6 |
|
789 5: [mq]: 6.patch - test |
|
790 4: [mq]: 5.patch - johndeere |
|
791 3: Four - jane |
|
792 2: Three (again) - maria |
|
793 1: [mq]: 2.patch - jane |
|
794 0: [mq]: 1.patch - mary |
|
795 ==== hg qref -u |
|
796 From: johndeere |
|
797 |
|
798 diff -r ... 6 |
|
799 --- /dev/null |
|
800 +++ b/6 |
|
801 @@ -0,0 +1,1 @@ |
|
802 +6 |
|
803 5: [mq]: 6.patch - johndeere |
|
804 4: [mq]: 5.patch - johndeere |
|
805 3: Four - jane |
|
806 2: Three (again) - maria |
|
807 1: [mq]: 2.patch - jane |
|
808 0: [mq]: 1.patch - mary |
|
809 ==== qpop -a / qpush -a |
|
810 popping 6.patch |
|
811 popping 5.patch |
|
812 popping 4.patch |
|
813 popping 3.patch |
|
814 popping 2.patch |
|
815 popping 1.patch |
|
816 patch queue now empty |
|
817 applying 1.patch |
|
818 applying 2.patch |
|
819 applying 3.patch |
|
820 applying 4.patch |
|
821 applying 5.patch |
|
822 applying 6.patch |
|
823 now at: 6.patch |
|
824 5: imported patch 6.patch - johndeere |
|
825 4: imported patch 5.patch - johndeere |
|
826 3: Four - jane |
|
827 2: Three (again) - maria |
|
828 1: imported patch 2.patch - jane |
|
829 0: imported patch 1.patch - mary |