158 2: [mq]: 5.patch - test - 10.00 |
148 2: [mq]: 5.patch - test - 10.00 |
159 1: Three (again) - test - 8.00 |
149 1: Three (again) - test - 8.00 |
160 0: [mq]: 1.patch - test - 4.00 |
150 0: [mq]: 1.patch - test - 4.00 |
161 ==== hg qref -d |
151 ==== hg qref -d |
162 # HG changeset patch |
152 # HG changeset patch |
|
153 # Parent |
163 # Date 11 0 |
154 # Date 11 0 |
164 |
155 |
165 diff -r ... 5 |
156 diff -r ... 5 |
166 --- /dev/null |
157 --- /dev/null |
167 +++ b/5 |
158 +++ b/5 |
168 @@ -0,0 +1,1 @@ |
159 @@ -0,0 +1,1 @@ |
169 +5 |
160 +5 |
170 2: [mq]: 5.patch - test - 11.00 |
161 2: [mq]: 5.patch - test - 11.00 |
171 1: Three (again) - test - 8.00 |
162 1: Three (again) - test - 8.00 |
172 0: [mq]: 1.patch - test - 4.00 |
163 0: [mq]: 1.patch - test - 4.00 |
|
164 ==== qnew with plain header |
|
165 popping 6.patch |
|
166 now at: 5.patch |
|
167 now at: 6.patch |
|
168 Date: 12 0 |
|
169 |
|
170 3: imported patch 6.patch - test |
|
171 2: [mq]: 5.patch - test |
|
172 1: Three (again) - test |
|
173 0: [mq]: 1.patch - test |
|
174 ==== hg qref |
|
175 adding 6 |
|
176 Date: 12 0 |
|
177 |
|
178 diff -r ... 6 |
|
179 --- /dev/null |
|
180 +++ b/6 |
|
181 @@ -0,0 +1,1 @@ |
|
182 +6 |
|
183 3: [mq]: 6.patch - test - 12.00 |
|
184 2: [mq]: 5.patch - test - 11.00 |
|
185 1: Three (again) - test - 8.00 |
|
186 0: [mq]: 1.patch - test - 4.00 |
|
187 ==== hg qref -d |
|
188 Date: 13 0 |
|
189 |
|
190 diff -r ... 6 |
|
191 --- /dev/null |
|
192 +++ b/6 |
|
193 @@ -0,0 +1,1 @@ |
|
194 +6 |
|
195 3: [mq]: 6.patch - test - 13.00 |
|
196 2: [mq]: 5.patch - test - 11.00 |
|
197 1: Three (again) - test - 8.00 |
|
198 0: [mq]: 1.patch - test - 4.00 |
|
199 popping 6.patch |
|
200 now at: 5.patch |
173 ==== qnew -u |
201 ==== qnew -u |
174 adding 6 |
202 adding 6 |
175 From: jane |
203 From: jane |
176 |
204 |
177 diff -r ... 6 |
205 diff -r ... 6 |
302 now at: 7.patch |
324 now at: 7.patch |
303 3: imported patch 7.patch - john - 13.00 |
325 3: imported patch 7.patch - john - 13.00 |
304 2: imported patch 5.patch - test - 11.00 |
326 2: imported patch 5.patch - test - 11.00 |
305 1: Three (again) - test - 8.00 |
327 1: Three (again) - test - 8.00 |
306 0: imported patch 1.patch - test - 4.00 |
328 0: imported patch 1.patch - test - 4.00 |
|
329 ======= hg headers |
|
330 ==== init |
|
331 ==== qnew -d |
|
332 # HG changeset patch |
|
333 # Parent |
|
334 # Date 3 0 |
|
335 |
|
336 0: [mq]: 1.patch - test - 3.00 |
|
337 ==== qref |
|
338 adding 1 |
|
339 # HG changeset patch |
|
340 # Parent |
|
341 # Date 3 0 |
|
342 |
|
343 diff -r ... 1 |
|
344 --- /dev/null |
|
345 +++ b/1 |
|
346 @@ -0,0 +1,1 @@ |
|
347 +1 |
|
348 0: [mq]: 1.patch - test - 3.00 |
|
349 ==== qref -d |
|
350 # HG changeset patch |
|
351 # Parent |
|
352 # Date 4 0 |
|
353 |
|
354 diff -r ... 1 |
|
355 --- /dev/null |
|
356 +++ b/1 |
|
357 @@ -0,0 +1,1 @@ |
|
358 +1 |
|
359 0: [mq]: 1.patch - test - 4.00 |
|
360 ==== qnew |
|
361 adding 2 |
|
362 # HG changeset patch |
|
363 # Parent |
|
364 |
|
365 diff -r ... 2 |
|
366 --- /dev/null |
|
367 +++ b/2 |
|
368 @@ -0,0 +1,1 @@ |
|
369 +2 |
|
370 1: [mq]: 2.patch - test |
|
371 0: [mq]: 1.patch - test |
|
372 ==== qref -d |
|
373 # HG changeset patch |
|
374 # Date 5 0 |
|
375 # Parent |
|
376 |
|
377 diff -r ... 2 |
|
378 --- /dev/null |
|
379 +++ b/2 |
|
380 @@ -0,0 +1,1 @@ |
|
381 +2 |
|
382 1: [mq]: 2.patch - test |
|
383 0: [mq]: 1.patch - test |
|
384 popping 2.patch |
|
385 now at: 1.patch |
|
386 ==== qnew -d -m |
|
387 # HG changeset patch |
|
388 # Parent |
|
389 # Date 6 0 |
|
390 |
|
391 Three |
|
392 |
|
393 1: Three - test - 6.00 |
|
394 0: [mq]: 1.patch - test - 4.00 |
|
395 ==== qref |
|
396 adding 3 |
|
397 # HG changeset patch |
|
398 # Parent |
|
399 # Date 6 0 |
|
400 |
|
401 Three |
|
402 |
|
403 diff -r ... 3 |
|
404 --- /dev/null |
|
405 +++ b/3 |
|
406 @@ -0,0 +1,1 @@ |
|
407 +3 |
|
408 1: Three - test - 6.00 |
|
409 0: [mq]: 1.patch - test - 4.00 |
|
410 ==== qref -m |
|
411 # HG changeset patch |
|
412 # Parent |
|
413 # Date 6 0 |
|
414 |
|
415 Drei |
|
416 |
|
417 diff -r ... 3 |
|
418 --- /dev/null |
|
419 +++ b/3 |
|
420 @@ -0,0 +1,1 @@ |
|
421 +3 |
|
422 1: Drei - test - 6.00 |
|
423 0: [mq]: 1.patch - test - 4.00 |
|
424 ==== qref -d |
|
425 # HG changeset patch |
|
426 # Parent |
|
427 # Date 7 0 |
|
428 |
|
429 Drei |
|
430 |
|
431 diff -r ... 3 |
|
432 --- /dev/null |
|
433 +++ b/3 |
|
434 @@ -0,0 +1,1 @@ |
|
435 +3 |
|
436 1: Drei - test - 7.00 |
|
437 0: [mq]: 1.patch - test - 4.00 |
|
438 ==== qref -d -m |
|
439 # HG changeset patch |
|
440 # Parent |
|
441 # Date 8 0 |
|
442 |
|
443 Three (again) |
|
444 |
|
445 diff -r ... 3 |
|
446 --- /dev/null |
|
447 +++ b/3 |
|
448 @@ -0,0 +1,1 @@ |
|
449 +3 |
|
450 1: Three (again) - test - 8.00 |
|
451 0: [mq]: 1.patch - test - 4.00 |
|
452 ==== qnew -m |
|
453 adding 4 |
|
454 # HG changeset patch |
|
455 # Parent |
|
456 Four |
|
457 |
|
458 diff -r ... 4 |
|
459 --- /dev/null |
|
460 +++ b/4 |
|
461 @@ -0,0 +1,1 @@ |
|
462 +4 |
|
463 2: Four - test |
|
464 1: Three (again) - test |
|
465 0: [mq]: 1.patch - test |
|
466 ==== qref -d |
|
467 # HG changeset patch |
|
468 # Date 9 0 |
|
469 # Parent |
|
470 Four |
|
471 |
|
472 diff -r ... 4 |
|
473 --- /dev/null |
|
474 +++ b/4 |
|
475 @@ -0,0 +1,1 @@ |
|
476 +4 |
|
477 2: Four - test |
|
478 1: Three (again) - test |
|
479 0: [mq]: 1.patch - test |
|
480 popping 4.patch |
|
481 now at: 3.patch |
|
482 ==== qnew with HG header |
|
483 popping 5.patch |
|
484 now at: 3.patch |
|
485 # HG changeset patch |
|
486 # Date 10 0 |
|
487 2: imported patch 5.patch - test - 10.00 |
|
488 1: Three (again) - test - 8.00 |
|
489 0: [mq]: 1.patch - test - 4.00 |
|
490 ==== hg qref |
|
491 adding 5 |
|
492 # HG changeset patch |
|
493 # Parent |
|
494 # Date 10 0 |
|
495 |
|
496 diff -r ... 5 |
|
497 --- /dev/null |
|
498 +++ b/5 |
|
499 @@ -0,0 +1,1 @@ |
|
500 +5 |
|
501 2: [mq]: 5.patch - test - 10.00 |
|
502 1: Three (again) - test - 8.00 |
|
503 0: [mq]: 1.patch - test - 4.00 |
|
504 ==== hg qref -d |
|
505 # HG changeset patch |
|
506 # Parent |
|
507 # Date 11 0 |
|
508 |
|
509 diff -r ... 5 |
|
510 --- /dev/null |
|
511 +++ b/5 |
|
512 @@ -0,0 +1,1 @@ |
|
513 +5 |
|
514 2: [mq]: 5.patch - test - 11.00 |
|
515 1: Three (again) - test - 8.00 |
|
516 0: [mq]: 1.patch - test - 4.00 |
|
517 ==== qnew with plain header |
|
518 popping 6.patch |
|
519 now at: 5.patch |
|
520 now at: 6.patch |
|
521 Date: 12 0 |
|
522 |
|
523 3: imported patch 6.patch - test |
|
524 2: [mq]: 5.patch - test |
|
525 1: Three (again) - test |
|
526 0: [mq]: 1.patch - test |
|
527 ==== hg qref |
|
528 adding 6 |
|
529 Date: 12 0 |
|
530 |
|
531 diff -r ... 6 |
|
532 --- /dev/null |
|
533 +++ b/6 |
|
534 @@ -0,0 +1,1 @@ |
|
535 +6 |
|
536 3: [mq]: 6.patch - test - 12.00 |
|
537 2: [mq]: 5.patch - test - 11.00 |
|
538 1: Three (again) - test - 8.00 |
|
539 0: [mq]: 1.patch - test - 4.00 |
|
540 ==== hg qref -d |
|
541 Date: 13 0 |
|
542 |
|
543 diff -r ... 6 |
|
544 --- /dev/null |
|
545 +++ b/6 |
|
546 @@ -0,0 +1,1 @@ |
|
547 +6 |
|
548 3: [mq]: 6.patch - test - 13.00 |
|
549 2: [mq]: 5.patch - test - 11.00 |
|
550 1: Three (again) - test - 8.00 |
|
551 0: [mq]: 1.patch - test - 4.00 |
|
552 popping 6.patch |
|
553 now at: 5.patch |
|
554 ==== qnew -u |
|
555 adding 6 |
|
556 # HG changeset patch |
|
557 # Parent |
|
558 # User jane |
|
559 |
|
560 diff -r ... 6 |
|
561 --- /dev/null |
|
562 +++ b/6 |
|
563 @@ -0,0 +1,1 @@ |
|
564 +6 |
|
565 3: [mq]: 6.patch - jane |
|
566 2: [mq]: 5.patch - test |
|
567 1: Three (again) - test |
|
568 0: [mq]: 1.patch - test |
|
569 ==== qref -d |
|
570 # HG changeset patch |
|
571 # Date 12 0 |
|
572 # Parent |
|
573 # User jane |
|
574 |
|
575 diff -r ... 6 |
|
576 --- /dev/null |
|
577 +++ b/6 |
|
578 @@ -0,0 +1,1 @@ |
|
579 +6 |
|
580 3: [mq]: 6.patch - jane |
|
581 2: [mq]: 5.patch - test |
|
582 1: Three (again) - test |
|
583 0: [mq]: 1.patch - test |
|
584 popping 6.patch |
|
585 now at: 5.patch |
|
586 ==== qnew -d |
|
587 adding 7 |
|
588 # HG changeset patch |
|
589 # Parent |
|
590 # Date 13 0 |
|
591 |
|
592 diff -r ... 7 |
|
593 --- /dev/null |
|
594 +++ b/7 |
|
595 @@ -0,0 +1,1 @@ |
|
596 +7 |
|
597 3: [mq]: 7.patch - test |
|
598 2: [mq]: 5.patch - test |
|
599 1: Three (again) - test |
|
600 0: [mq]: 1.patch - test |
|
601 ==== qref -u |
|
602 # HG changeset patch |
|
603 # User john |
|
604 # Parent |
|
605 # Date 13 0 |
|
606 |
|
607 diff -r ... 7 |
|
608 --- /dev/null |
|
609 +++ b/7 |
|
610 @@ -0,0 +1,1 @@ |
|
611 +7 |
|
612 3: [mq]: 7.patch - john - 13.00 |
|
613 2: [mq]: 5.patch - test - 11.00 |
|
614 1: Three (again) - test - 8.00 |
|
615 0: [mq]: 1.patch - test - 4.00 |
|
616 ==== qnew |
|
617 adding 8 |
|
618 # HG changeset patch |
|
619 # Parent |
|
620 |
|
621 diff -r ... 8 |
|
622 --- /dev/null |
|
623 +++ b/8 |
|
624 @@ -0,0 +1,1 @@ |
|
625 +8 |
|
626 4: [mq]: 8.patch - test |
|
627 3: [mq]: 7.patch - john |
|
628 2: [mq]: 5.patch - test |
|
629 1: Three (again) - test |
|
630 0: [mq]: 1.patch - test |
|
631 ==== qref -u -d |
|
632 # HG changeset patch |
|
633 # Date 14 0 |
|
634 # User john |
|
635 # Parent |
|
636 |
|
637 diff -r ... 8 |
|
638 --- /dev/null |
|
639 +++ b/8 |
|
640 @@ -0,0 +1,1 @@ |
|
641 +8 |
|
642 4: [mq]: 8.patch - john |
|
643 3: [mq]: 7.patch - john |
|
644 2: [mq]: 5.patch - test |
|
645 1: Three (again) - test |
|
646 0: [mq]: 1.patch - test |
|
647 popping 8.patch |
|
648 now at: 7.patch |
|
649 ==== qnew -m |
|
650 adding 9 |
|
651 # HG changeset patch |
|
652 # Parent |
|
653 Nine |
|
654 |
|
655 diff -r ... 9 |
|
656 --- /dev/null |
|
657 +++ b/9 |
|
658 @@ -0,0 +1,1 @@ |
|
659 +9 |
|
660 4: Nine - test |
|
661 3: [mq]: 7.patch - john |
|
662 2: [mq]: 5.patch - test |
|
663 1: Three (again) - test |
|
664 0: [mq]: 1.patch - test |
|
665 ==== qref -u -d |
|
666 # HG changeset patch |
|
667 # Date 15 0 |
|
668 # User john |
|
669 # Parent |
|
670 Nine |
|
671 |
|
672 diff -r ... 9 |
|
673 --- /dev/null |
|
674 +++ b/9 |
|
675 @@ -0,0 +1,1 @@ |
|
676 +9 |
|
677 4: Nine - john |
|
678 3: [mq]: 7.patch - john |
|
679 2: [mq]: 5.patch - test |
|
680 1: Three (again) - test |
|
681 0: [mq]: 1.patch - test |
|
682 popping 9.patch |
|
683 now at: 7.patch |
|
684 ==== qpop -a / qpush -a |
|
685 popping 7.patch |
|
686 popping 5.patch |
|
687 popping 3.patch |
|
688 popping 1.patch |
|
689 patch queue now empty |
|
690 applying 1.patch |
|
691 applying 3.patch |
|
692 applying 5.patch |
|
693 applying 7.patch |
|
694 now at: 7.patch |
|
695 3: imported patch 7.patch - john - 13.00 |
|
696 2: imported patch 5.patch - test - 11.00 |
|
697 1: Three (again) - test - 8.00 |
|
698 0: imported patch 1.patch - test - 4.00 |