Show More
@@ -1077,12 +1077,12 b' class queue(object):' | |||||
1077 | p.write("Date: %d %d\n" % date) |
|
1077 | p.write("Date: %d %d\n" % date) | |
1078 | else: |
|
1078 | else: | |
1079 | p.write("# HG changeset patch\n") |
|
1079 | p.write("# HG changeset patch\n") | |
1080 | p.write("# Parent " |
|
|||
1081 | + hex(repo[None].p1().node()) + "\n") |
|
|||
1082 | if user: |
|
1080 | if user: | |
1083 | p.write("# User " + user + "\n") |
|
1081 | p.write("# User " + user + "\n") | |
1084 | if date: |
|
1082 | if date: | |
1085 | p.write("# Date %s %s\n" % date) |
|
1083 | p.write("# Date %s %s\n" % date) | |
|
1084 | p.write("# Parent " | |||
|
1085 | + hex(repo[None].p1().node()) + "\n") | |||
1086 |
|
1086 | |||
1087 | defaultmsg = "[mq]: %s" % patchfn |
|
1087 | defaultmsg = "[mq]: %s" % patchfn | |
1088 | editor = cmdutil.getcommiteditor(editform=editform) |
|
1088 | editor = cmdutil.getcommiteditor(editform=editform) |
@@ -17,8 +17,8 b' git=auto: regular patch creation:' | |||||
17 |
|
17 | |||
18 | $ cat .hg/patches/adda |
|
18 | $ cat .hg/patches/adda | |
19 | # HG changeset patch |
|
19 | # HG changeset patch | |
|
20 | # Date 0 0 | |||
20 | # Parent 0000000000000000000000000000000000000000 |
|
21 | # Parent 0000000000000000000000000000000000000000 | |
21 | # Date 0 0 |
|
|||
22 |
|
22 | |||
23 | diff -r 000000000000 -r ef8dafc9fa4c a |
|
23 | diff -r 000000000000 -r ef8dafc9fa4c a | |
24 | --- /dev/null |
|
24 | --- /dev/null | |
@@ -33,8 +33,8 b' git=auto: git patch creation with copy:' | |||||
33 |
|
33 | |||
34 | $ cat .hg/patches/copy |
|
34 | $ cat .hg/patches/copy | |
35 | # HG changeset patch |
|
35 | # HG changeset patch | |
|
36 | # Date 0 0 | |||
36 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
37 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
37 | # Date 0 0 |
|
|||
38 |
|
38 | |||
39 | diff --git a/a b/b |
|
39 | diff --git a/a b/b | |
40 | copy from a |
|
40 | copy from a | |
@@ -48,8 +48,8 b' git=auto: git patch when using --git:' | |||||
48 |
|
48 | |||
49 | $ cat .hg/patches/git |
|
49 | $ cat .hg/patches/git | |
50 | # HG changeset patch |
|
50 | # HG changeset patch | |
|
51 | # Date 0 0 | |||
51 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
|
52 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | |
52 | # Date 0 0 |
|
|||
53 |
|
53 | |||
54 | diff --git a/regular b/regular |
|
54 | diff --git a/regular b/regular | |
55 | new file mode 100644 |
|
55 | new file mode 100644 | |
@@ -64,8 +64,8 b' git=auto: regular patch after qrefresh w' | |||||
64 |
|
64 | |||
65 | $ cat .hg/patches/git |
|
65 | $ cat .hg/patches/git | |
66 | # HG changeset patch |
|
66 | # HG changeset patch | |
|
67 | # Date 0 0 | |||
67 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d |
|
68 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | |
68 | # Date 0 0 |
|
|||
69 |
|
69 | |||
70 | diff -r 99586d5f048c regular |
|
70 | diff -r 99586d5f048c regular | |
71 | --- /dev/null |
|
71 | --- /dev/null | |
@@ -88,8 +88,8 b' git=keep: git patch with --git:' | |||||
88 |
|
88 | |||
89 | $ cat .hg/patches/git |
|
89 | $ cat .hg/patches/git | |
90 | # HG changeset patch |
|
90 | # HG changeset patch | |
|
91 | # Date 0 0 | |||
91 | # Parent 0000000000000000000000000000000000000000 |
|
92 | # Parent 0000000000000000000000000000000000000000 | |
92 | # Date 0 0 |
|
|||
93 |
|
93 | |||
94 | diff --git a/a b/a |
|
94 | diff --git a/a b/a | |
95 | new file mode 100644 |
|
95 | new file mode 100644 | |
@@ -105,8 +105,8 b' git=keep: git patch after qrefresh witho' | |||||
105 |
|
105 | |||
106 | $ cat .hg/patches/git |
|
106 | $ cat .hg/patches/git | |
107 | # HG changeset patch |
|
107 | # HG changeset patch | |
|
108 | # Date 0 0 | |||
108 | # Parent 0000000000000000000000000000000000000000 |
|
109 | # Parent 0000000000000000000000000000000000000000 | |
109 | # Date 0 0 |
|
|||
110 |
|
110 | |||
111 | diff --git a/a b/a |
|
111 | diff --git a/a b/a | |
112 | new file mode 100644 |
|
112 | new file mode 100644 | |
@@ -130,8 +130,8 b' git=yes: git patch:' | |||||
130 |
|
130 | |||
131 | $ cat .hg/patches/git |
|
131 | $ cat .hg/patches/git | |
132 | # HG changeset patch |
|
132 | # HG changeset patch | |
|
133 | # Date 0 0 | |||
133 | # Parent 0000000000000000000000000000000000000000 |
|
134 | # Parent 0000000000000000000000000000000000000000 | |
134 | # Date 0 0 |
|
|||
135 |
|
135 | |||
136 | diff --git a/a b/a |
|
136 | diff --git a/a b/a | |
137 | new file mode 100644 |
|
137 | new file mode 100644 | |
@@ -147,8 +147,8 b' git=yes: git patch after qrefresh:' | |||||
147 |
|
147 | |||
148 | $ cat .hg/patches/git |
|
148 | $ cat .hg/patches/git | |
149 | # HG changeset patch |
|
149 | # HG changeset patch | |
|
150 | # Date 0 0 | |||
150 | # Parent 0000000000000000000000000000000000000000 |
|
151 | # Parent 0000000000000000000000000000000000000000 | |
151 | # Date 0 0 |
|
|||
152 |
|
152 | |||
153 | diff --git a/a b/a |
|
153 | diff --git a/a b/a | |
154 | new file mode 100644 |
|
154 | new file mode 100644 | |
@@ -176,8 +176,8 b' git=no: regular patch with copy:' | |||||
176 |
|
176 | |||
177 | $ cat .hg/patches/regular |
|
177 | $ cat .hg/patches/regular | |
178 | # HG changeset patch |
|
178 | # HG changeset patch | |
|
179 | # Date 0 0 | |||
179 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
180 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
180 | # Date 0 0 |
|
|||
181 |
|
181 | |||
182 | diff -r ef8dafc9fa4c -r a70404f79ba3 b |
|
182 | diff -r ef8dafc9fa4c -r a70404f79ba3 b | |
183 | --- /dev/null |
|
183 | --- /dev/null | |
@@ -192,8 +192,8 b' git=no: regular patch after qrefresh wit' | |||||
192 |
|
192 | |||
193 | $ cat .hg/patches/regular |
|
193 | $ cat .hg/patches/regular | |
194 | # HG changeset patch |
|
194 | # HG changeset patch | |
|
195 | # Date 0 0 | |||
195 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
196 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
196 | # Date 0 0 |
|
|||
197 |
|
197 | |||
198 | diff -r ef8dafc9fa4c b |
|
198 | diff -r ef8dafc9fa4c b | |
199 | --- /dev/null |
|
199 | --- /dev/null |
@@ -528,15 +528,15 b'' | |||||
528 | ==== init |
|
528 | ==== init | |
529 | ==== qnew -d |
|
529 | ==== qnew -d | |
530 | # HG changeset patch |
|
530 | # HG changeset patch | |
|
531 | # Date 3 0 | |||
531 | # Parent |
|
532 | # Parent | |
532 | # Date 3 0 |
|
|||
533 |
|
533 | |||
534 | 0: [mq]: 1.patch - test - 3.00 |
|
534 | 0: [mq]: 1.patch - test - 3.00 | |
535 | ==== qref |
|
535 | ==== qref | |
536 | adding 1 |
|
536 | adding 1 | |
537 | # HG changeset patch |
|
537 | # HG changeset patch | |
|
538 | # Date 3 0 | |||
538 | # Parent |
|
539 | # Parent | |
539 | # Date 3 0 |
|
|||
540 |
|
540 | |||
541 | diff -r ... 1 |
|
541 | diff -r ... 1 | |
542 | --- /dev/null |
|
542 | --- /dev/null | |
@@ -546,8 +546,8 b'' | |||||
546 | 0: [mq]: 1.patch - test - 3.00 |
|
546 | 0: [mq]: 1.patch - test - 3.00 | |
547 | ==== qref -d |
|
547 | ==== qref -d | |
548 | # HG changeset patch |
|
548 | # HG changeset patch | |
|
549 | # Date 4 0 | |||
549 | # Parent |
|
550 | # Parent | |
550 | # Date 4 0 |
|
|||
551 |
|
551 | |||
552 | diff -r ... 1 |
|
552 | diff -r ... 1 | |
553 | --- /dev/null |
|
553 | --- /dev/null | |
@@ -583,8 +583,8 b'' | |||||
583 | now at: 1.patch |
|
583 | now at: 1.patch | |
584 | ==== qnew -d -m |
|
584 | ==== qnew -d -m | |
585 | # HG changeset patch |
|
585 | # HG changeset patch | |
|
586 | # Date 6 0 | |||
586 | # Parent |
|
587 | # Parent | |
587 | # Date 6 0 |
|
|||
588 | Three |
|
588 | Three | |
589 |
|
589 | |||
590 | 1: Three - test - 6.00 |
|
590 | 1: Three - test - 6.00 | |
@@ -592,8 +592,8 b'' | |||||
592 | ==== qref |
|
592 | ==== qref | |
593 | adding 3 |
|
593 | adding 3 | |
594 | # HG changeset patch |
|
594 | # HG changeset patch | |
|
595 | # Date 6 0 | |||
595 | # Parent |
|
596 | # Parent | |
596 | # Date 6 0 |
|
|||
597 | Three |
|
597 | Three | |
598 |
|
598 | |||
599 | diff -r ... 3 |
|
599 | diff -r ... 3 | |
@@ -605,8 +605,8 b'' | |||||
605 | 0: [mq]: 1.patch - test - 4.00 |
|
605 | 0: [mq]: 1.patch - test - 4.00 | |
606 | ==== qref -m |
|
606 | ==== qref -m | |
607 | # HG changeset patch |
|
607 | # HG changeset patch | |
|
608 | # Date 6 0 | |||
608 | # Parent |
|
609 | # Parent | |
609 | # Date 6 0 |
|
|||
610 | Drei |
|
610 | Drei | |
611 |
|
611 | |||
612 | diff -r ... 3 |
|
612 | diff -r ... 3 | |
@@ -618,8 +618,8 b'' | |||||
618 | 0: [mq]: 1.patch - test - 4.00 |
|
618 | 0: [mq]: 1.patch - test - 4.00 | |
619 | ==== qref -d |
|
619 | ==== qref -d | |
620 | # HG changeset patch |
|
620 | # HG changeset patch | |
|
621 | # Date 7 0 | |||
621 | # Parent |
|
622 | # Parent | |
622 | # Date 7 0 |
|
|||
623 | Drei |
|
623 | Drei | |
624 |
|
624 | |||
625 | diff -r ... 3 |
|
625 | diff -r ... 3 | |
@@ -631,8 +631,8 b'' | |||||
631 | 0: [mq]: 1.patch - test - 4.00 |
|
631 | 0: [mq]: 1.patch - test - 4.00 | |
632 | ==== qref -d -m |
|
632 | ==== qref -d -m | |
633 | # HG changeset patch |
|
633 | # HG changeset patch | |
|
634 | # Date 8 0 | |||
634 | # Parent |
|
635 | # Parent | |
635 | # Date 8 0 |
|
|||
636 | Three (again) |
|
636 | Three (again) | |
637 |
|
637 | |||
638 | diff -r ... 3 |
|
638 | diff -r ... 3 | |
@@ -747,8 +747,8 b'' | |||||
747 | ==== qnew -u |
|
747 | ==== qnew -u | |
748 | adding 6 |
|
748 | adding 6 | |
749 | # HG changeset patch |
|
749 | # HG changeset patch | |
|
750 | # User jane | |||
750 | # Parent |
|
751 | # Parent | |
751 | # User jane |
|
|||
752 |
|
752 | |||
753 | diff -r ... 6 |
|
753 | diff -r ... 6 | |
754 | --- /dev/null |
|
754 | --- /dev/null | |
@@ -762,8 +762,8 b'' | |||||
762 | ==== qref -d |
|
762 | ==== qref -d | |
763 | # HG changeset patch |
|
763 | # HG changeset patch | |
764 | # Date 12 0 |
|
764 | # Date 12 0 | |
|
765 | # User jane | |||
765 | # Parent |
|
766 | # Parent | |
766 | # User jane |
|
|||
767 |
|
767 | |||
768 | diff -r ... 6 |
|
768 | diff -r ... 6 | |
769 | --- /dev/null |
|
769 | --- /dev/null | |
@@ -779,8 +779,8 b'' | |||||
779 | ==== qnew -d |
|
779 | ==== qnew -d | |
780 | adding 7 |
|
780 | adding 7 | |
781 | # HG changeset patch |
|
781 | # HG changeset patch | |
|
782 | # Date 13 0 | |||
782 | # Parent |
|
783 | # Parent | |
783 | # Date 13 0 |
|
|||
784 |
|
784 | |||
785 | diff -r ... 7 |
|
785 | diff -r ... 7 | |
786 | --- /dev/null |
|
786 | --- /dev/null | |
@@ -794,8 +794,8 b'' | |||||
794 | ==== qref -u |
|
794 | ==== qref -u | |
795 | # HG changeset patch |
|
795 | # HG changeset patch | |
796 | # User john |
|
796 | # User john | |
|
797 | # Date 13 0 | |||
797 | # Parent |
|
798 | # Parent | |
798 | # Date 13 0 |
|
|||
799 |
|
799 | |||
800 | diff -r ... 7 |
|
800 | diff -r ... 7 | |
801 | --- /dev/null |
|
801 | --- /dev/null |
@@ -399,15 +399,15 b'' | |||||
399 | ==== init |
|
399 | ==== init | |
400 | ==== qnew -U |
|
400 | ==== qnew -U | |
401 | # HG changeset patch |
|
401 | # HG changeset patch | |
|
402 | # User test | |||
402 | # Parent |
|
403 | # Parent | |
403 | # User test |
|
|||
404 |
|
404 | |||
405 | 0: [mq]: 1.patch - test |
|
405 | 0: [mq]: 1.patch - test | |
406 | ==== qref |
|
406 | ==== qref | |
407 | adding 1 |
|
407 | adding 1 | |
408 | # HG changeset patch |
|
408 | # HG changeset patch | |
|
409 | # User test | |||
409 | # Parent |
|
410 | # Parent | |
410 | # User test |
|
|||
411 |
|
411 | |||
412 | diff -r ... 1 |
|
412 | diff -r ... 1 | |
413 | --- /dev/null |
|
413 | --- /dev/null | |
@@ -417,8 +417,8 b'' | |||||
417 | 0: [mq]: 1.patch - test |
|
417 | 0: [mq]: 1.patch - test | |
418 | ==== qref -u |
|
418 | ==== qref -u | |
419 | # HG changeset patch |
|
419 | # HG changeset patch | |
|
420 | # User mary | |||
420 | # Parent |
|
421 | # Parent | |
421 | # User mary |
|
|||
422 |
|
422 | |||
423 | diff -r ... 1 |
|
423 | diff -r ... 1 | |
424 | --- /dev/null |
|
424 | --- /dev/null | |
@@ -452,8 +452,8 b'' | |||||
452 | 0: [mq]: 1.patch - mary |
|
452 | 0: [mq]: 1.patch - mary | |
453 | ==== qnew -U -m |
|
453 | ==== qnew -U -m | |
454 | # HG changeset patch |
|
454 | # HG changeset patch | |
|
455 | # User test | |||
455 | # Parent |
|
456 | # Parent | |
456 | # User test |
|
|||
457 | Three |
|
457 | Three | |
458 |
|
458 | |||
459 | 2: Three - test |
|
459 | 2: Three - test | |
@@ -462,8 +462,8 b'' | |||||
462 | ==== qref |
|
462 | ==== qref | |
463 | adding 3 |
|
463 | adding 3 | |
464 | # HG changeset patch |
|
464 | # HG changeset patch | |
|
465 | # User test | |||
465 | # Parent |
|
466 | # Parent | |
466 | # User test |
|
|||
467 | Three |
|
467 | Three | |
468 |
|
468 | |||
469 | diff -r ... 3 |
|
469 | diff -r ... 3 | |
@@ -476,8 +476,8 b'' | |||||
476 | 0: [mq]: 1.patch - mary |
|
476 | 0: [mq]: 1.patch - mary | |
477 | ==== qref -m |
|
477 | ==== qref -m | |
478 | # HG changeset patch |
|
478 | # HG changeset patch | |
|
479 | # User test | |||
479 | # Parent |
|
480 | # Parent | |
480 | # User test |
|
|||
481 | Drei |
|
481 | Drei | |
482 |
|
482 | |||
483 | diff -r ... 3 |
|
483 | diff -r ... 3 | |
@@ -490,8 +490,8 b'' | |||||
490 | 0: [mq]: 1.patch - mary |
|
490 | 0: [mq]: 1.patch - mary | |
491 | ==== qref -u |
|
491 | ==== qref -u | |
492 | # HG changeset patch |
|
492 | # HG changeset patch | |
|
493 | # User mary | |||
493 | # Parent |
|
494 | # Parent | |
494 | # User mary |
|
|||
495 | Drei |
|
495 | Drei | |
496 |
|
496 | |||
497 | diff -r ... 3 |
|
497 | diff -r ... 3 | |
@@ -504,8 +504,8 b'' | |||||
504 | 0: [mq]: 1.patch - mary |
|
504 | 0: [mq]: 1.patch - mary | |
505 | ==== qref -u -m |
|
505 | ==== qref -u -m | |
506 | # HG changeset patch |
|
506 | # HG changeset patch | |
|
507 | # User maria | |||
507 | # Parent |
|
508 | # Parent | |
508 | # User maria |
|
|||
509 | Three (again) |
|
509 | Three (again) | |
510 |
|
510 | |||
511 | diff -r ... 3 |
|
511 | diff -r ... 3 | |
@@ -684,15 +684,15 b'' | |||||
684 | ==== init |
|
684 | ==== init | |
685 | ==== qnew -U |
|
685 | ==== qnew -U | |
686 | # HG changeset patch |
|
686 | # HG changeset patch | |
|
687 | # User test | |||
687 | # Parent |
|
688 | # Parent | |
688 | # User test |
|
|||
689 |
|
689 | |||
690 | 0: [mq]: 1.patch - test |
|
690 | 0: [mq]: 1.patch - test | |
691 | ==== qref |
|
691 | ==== qref | |
692 | adding 1 |
|
692 | adding 1 | |
693 | # HG changeset patch |
|
693 | # HG changeset patch | |
|
694 | # User test | |||
694 | # Parent |
|
695 | # Parent | |
695 | # User test |
|
|||
696 |
|
696 | |||
697 | diff -r ... 1 |
|
697 | diff -r ... 1 | |
698 | --- /dev/null |
|
698 | --- /dev/null | |
@@ -702,8 +702,8 b'' | |||||
702 | 0: [mq]: 1.patch - test |
|
702 | 0: [mq]: 1.patch - test | |
703 | ==== qref -u |
|
703 | ==== qref -u | |
704 | # HG changeset patch |
|
704 | # HG changeset patch | |
|
705 | # User mary | |||
705 | # Parent |
|
706 | # Parent | |
706 | # User mary |
|
|||
707 |
|
707 | |||
708 | diff -r ... 1 |
|
708 | diff -r ... 1 | |
709 | --- /dev/null |
|
709 | --- /dev/null | |
@@ -737,8 +737,8 b'' | |||||
737 | 0: [mq]: 1.patch - mary |
|
737 | 0: [mq]: 1.patch - mary | |
738 | ==== qnew -U -m |
|
738 | ==== qnew -U -m | |
739 | # HG changeset patch |
|
739 | # HG changeset patch | |
|
740 | # User test | |||
740 | # Parent |
|
741 | # Parent | |
741 | # User test |
|
|||
742 | Three |
|
742 | Three | |
743 |
|
743 | |||
744 | 2: Three - test |
|
744 | 2: Three - test | |
@@ -747,8 +747,8 b'' | |||||
747 | ==== qref |
|
747 | ==== qref | |
748 | adding 3 |
|
748 | adding 3 | |
749 | # HG changeset patch |
|
749 | # HG changeset patch | |
|
750 | # User test | |||
750 | # Parent |
|
751 | # Parent | |
751 | # User test |
|
|||
752 | Three |
|
752 | Three | |
753 |
|
753 | |||
754 | diff -r ... 3 |
|
754 | diff -r ... 3 | |
@@ -761,8 +761,8 b'' | |||||
761 | 0: [mq]: 1.patch - mary |
|
761 | 0: [mq]: 1.patch - mary | |
762 | ==== qref -m |
|
762 | ==== qref -m | |
763 | # HG changeset patch |
|
763 | # HG changeset patch | |
|
764 | # User test | |||
764 | # Parent |
|
765 | # Parent | |
765 | # User test |
|
|||
766 | Drei |
|
766 | Drei | |
767 |
|
767 | |||
768 | diff -r ... 3 |
|
768 | diff -r ... 3 | |
@@ -775,8 +775,8 b'' | |||||
775 | 0: [mq]: 1.patch - mary |
|
775 | 0: [mq]: 1.patch - mary | |
776 | ==== qref -u |
|
776 | ==== qref -u | |
777 | # HG changeset patch |
|
777 | # HG changeset patch | |
|
778 | # User mary | |||
778 | # Parent |
|
779 | # Parent | |
779 | # User mary |
|
|||
780 | Drei |
|
780 | Drei | |
781 |
|
781 | |||
782 | diff -r ... 3 |
|
782 | diff -r ... 3 | |
@@ -789,8 +789,8 b'' | |||||
789 | 0: [mq]: 1.patch - mary |
|
789 | 0: [mq]: 1.patch - mary | |
790 | ==== qref -u -m |
|
790 | ==== qref -u -m | |
791 | # HG changeset patch |
|
791 | # HG changeset patch | |
|
792 | # User maria | |||
792 | # Parent |
|
793 | # Parent | |
793 | # User maria |
|
|||
794 | Three (again) |
|
794 | Three (again) | |
795 |
|
795 | |||
796 | diff -r ... 3 |
|
796 | diff -r ... 3 |
@@ -160,8 +160,8 b' Check patcha2 is still a regular patch:' | |||||
160 |
|
160 | |||
161 | $ cat .hg/patches/patcha2 |
|
161 | $ cat .hg/patches/patcha2 | |
162 | # HG changeset patch |
|
162 | # HG changeset patch | |
|
163 | # Date 0 0 | |||
163 | # Parent ???????????????????????????????????????? (glob) |
|
164 | # Parent ???????????????????????????????????????? (glob) | |
164 | # Date 0 0 |
|
|||
165 |
|
165 | |||
166 | diff -r ???????????? -r ???????????? a (glob) |
|
166 | diff -r ???????????? -r ???????????? a (glob) | |
167 | --- a/a |
|
167 | --- a/a |
@@ -218,13 +218,13 b' hg headers' | |||||
218 | +b |
|
218 | +b | |
219 | % qnew -u with no username configured |
|
219 | % qnew -u with no username configured | |
220 | # HG changeset patch |
|
220 | # HG changeset patch | |
|
221 | # User blue | |||
221 | # Parent |
|
222 | # Parent | |
222 | # User blue |
|
|||
223 |
|
223 | |||
224 | % qnew -e -u with no username configured |
|
224 | % qnew -e -u with no username configured | |
225 | # HG changeset patch |
|
225 | # HG changeset patch | |
|
226 | # User chartreuse | |||
226 | # Parent |
|
227 | # Parent | |
227 | # User chartreuse |
|
|||
228 |
|
228 | |||
229 | % fail when trying to import a merge |
|
229 | % fail when trying to import a merge | |
230 | adding a |
|
230 | adding a |
@@ -419,9 +419,9 b" both into 'revision' and 'patch file und" | |||||
419 | +b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub |
|
419 | +b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub | |
420 | $ cat .hg/patches/import-at-qnew |
|
420 | $ cat .hg/patches/import-at-qnew | |
421 | # HG changeset patch |
|
421 | # HG changeset patch | |
422 | # Parent f499373e340cdca5d01dee904aeb42dd2a325e71 |
|
|||
423 | # User test |
|
422 | # User test | |
424 | # Date 0 0 |
|
423 | # Date 0 0 | |
|
424 | # Parent f499373e340cdca5d01dee904aeb42dd2a325e71 | |||
425 |
|
425 | |||
426 | diff -r f499373e340c -r f69e96d86e75 .hgsub |
|
426 | diff -r f499373e340c -r f69e96d86e75 .hgsub | |
427 | --- /dev/null |
|
427 | --- /dev/null | |
@@ -554,9 +554,9 b' check whether qrefresh imports updated .' | |||||
554 | +88ac1bef5ed43b689d1d200b59886b675dec474b sub |
|
554 | +88ac1bef5ed43b689d1d200b59886b675dec474b sub | |
555 | $ cat .hg/patches/checkstate-at-qnew |
|
555 | $ cat .hg/patches/checkstate-at-qnew | |
556 | # HG changeset patch |
|
556 | # HG changeset patch | |
557 | # Parent 4d91eb2fa1d1b22ec513347b9cd06f6b49d470fa |
|
|||
558 | # User test |
|
557 | # User test | |
559 | # Date 0 0 |
|
558 | # Date 0 0 | |
|
559 | # Parent 4d91eb2fa1d1b22ec513347b9cd06f6b49d470fa | |||
560 |
|
560 | |||
561 | diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate |
|
561 | diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate | |
562 | --- a/.hgsubstate |
|
562 | --- a/.hgsubstate |
General Comments 0
You need to be logged in to leave comments.
Login now