66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
67 reverting _a |
67 reverting _a |
68 adding _d |
68 adding _d |
69 diff --git a/_a b/_a |
69 diff --git a/_a b/_a |
70 1 hunks, 1 lines changed |
70 1 hunks, 1 lines changed |
71 examine changes to '_a'? |
71 examine changes to '_a'? [Ynesfdaq?] y |
72 (enter ? for help) [Ynesfdaq?] y |
|
73 |
72 |
74 @@ -1,0 +2,1 @@ |
73 @@ -1,0 +2,1 @@ |
75 +change to a |
74 +change to a |
76 record change 1/2 to '_a'? |
75 record change 1/2 to '_a'? [Ynesfdaq?] y |
77 (enter ? for help) [Ynesfdaq?] y |
|
78 |
76 |
79 diff --git a/_d b/_d |
77 diff --git a/_d b/_d |
80 new file mode 100644 |
78 new file mode 100644 |
81 examine changes to '_d'? |
79 examine changes to '_d'? [Ynesfdaq?] y |
82 (enter ? for help) [Ynesfdaq?] y |
|
83 |
80 |
84 @@ -0,0 +1,1 @@ |
81 @@ -0,0 +1,1 @@ |
85 +_d |
82 +_d |
86 record change 2/2 to '_d'? |
83 record change 2/2 to '_d'? [Ynesfdaq?] n |
87 (enter ? for help) [Ynesfdaq?] n |
|
88 |
84 |
89 created new head |
85 created new head |
90 continue splitting? [Ycdq?] Y |
86 continue splitting? [Ycdq?] Y |
91 diff --git a/_d b/_d |
87 diff --git a/_d b/_d |
92 new file mode 100644 |
88 new file mode 100644 |
93 examine changes to '_d'? |
89 examine changes to '_d'? [Ynesfdaq?] y |
94 (enter ? for help) [Ynesfdaq?] y |
|
95 |
90 |
96 @@ -0,0 +1,1 @@ |
91 @@ -0,0 +1,1 @@ |
97 +_d |
92 +_d |
98 record this change to '_d'? |
93 record this change to '_d'? [Ynesfdaq?] y |
99 (enter ? for help) [Ynesfdaq?] y |
|
100 |
94 |
101 no more change to split |
95 no more change to split |
102 |
96 |
103 $ hg debugobsolete |
97 $ hg debugobsolete |
104 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
98 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
194 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
188 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
195 reverting _b |
189 reverting _b |
196 adding _c |
190 adding _c |
197 diff --git a/_b b/_b |
191 diff --git a/_b b/_b |
198 1 hunks, 1 lines changed |
192 1 hunks, 1 lines changed |
199 examine changes to '_b'? |
193 examine changes to '_b'? [Ynesfdaq?] y |
200 (enter ? for help) [Ynesfdaq?] y |
|
201 |
194 |
202 @@ -1,0 +2,1 @@ |
195 @@ -1,0 +2,1 @@ |
203 +change to b |
196 +change to b |
204 record change 1/2 to '_b'? |
197 record change 1/2 to '_b'? [Ynesfdaq?] y |
205 (enter ? for help) [Ynesfdaq?] y |
|
206 |
198 |
207 diff --git a/_c b/_c |
199 diff --git a/_c b/_c |
208 new file mode 100644 |
200 new file mode 100644 |
209 examine changes to '_c'? |
201 examine changes to '_c'? [Ynesfdaq?] y |
210 (enter ? for help) [Ynesfdaq?] y |
|
211 |
202 |
212 @@ -0,0 +1,1 @@ |
203 @@ -0,0 +1,1 @@ |
213 +_c |
204 +_c |
214 record change 2/2 to '_c'? |
205 record change 2/2 to '_c'? [Ynesfdaq?] n |
215 (enter ? for help) [Ynesfdaq?] n |
|
216 |
206 |
217 created new head |
207 created new head |
218 continue splitting? [Ycdq?] c |
208 continue splitting? [Ycdq?] c |
219 2 new orphan changesets |
209 2 new orphan changesets |
220 |
210 |
301 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
291 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
302 reverting _a |
292 reverting _a |
303 adding _d |
293 adding _d |
304 diff --git a/_a b/_a |
294 diff --git a/_a b/_a |
305 1 hunks, 2 lines changed |
295 1 hunks, 2 lines changed |
306 examine changes to '_a'? |
296 examine changes to '_a'? [Ynesfdaq?] y |
307 (enter ? for help) [Ynesfdaq?] y |
|
308 |
297 |
309 @@ -1,2 +1,1 @@ |
298 @@ -1,2 +1,1 @@ |
310 -_a |
299 -_a |
311 -change to a |
300 -change to a |
312 +changetofilea |
301 +changetofilea |
313 record change 1/2 to '_a'? |
302 record change 1/2 to '_a'? [Ynesfdaq?] y |
314 (enter ? for help) [Ynesfdaq?] y |
|
315 |
303 |
316 diff --git a/_d b/_d |
304 diff --git a/_d b/_d |
317 new file mode 100644 |
305 new file mode 100644 |
318 examine changes to '_d'? |
306 examine changes to '_d'? [Ynesfdaq?] n |
319 (enter ? for help) [Ynesfdaq?] n |
|
320 |
307 |
321 created new head |
308 created new head |
322 continue splitting? [Ycdq?] c |
309 continue splitting? [Ycdq?] c |
323 $ hg log -G -r "3f134f739075::" |
310 $ hg log -G -r "3f134f739075::" |
324 @ changeset: 16:452a26648478 |
311 @ changeset: 16:452a26648478 |
349 (leaving bookmark bookB) |
336 (leaving bookmark bookB) |
350 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
337 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
351 adding _d |
338 adding _d |
352 diff --git a/_d b/_d |
339 diff --git a/_d b/_d |
353 new file mode 100644 |
340 new file mode 100644 |
354 examine changes to '_d'? |
341 examine changes to '_d'? [Ynesfdaq?] abort: response expected |
355 (enter ? for help) [Ynesfdaq?] abort: response expected |
|
356 [255] |
342 [255] |
357 |
343 |
358 Cannot split a commit that is not a head if instability is not allowed |
344 Cannot split a commit that is not a head if instability is not allowed |
359 $ cat >> $HGRCPATH <<EOF |
345 $ cat >> $HGRCPATH <<EOF |
360 > [experimental] |
346 > [experimental] |
376 > EOF |
362 > EOF |
377 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
363 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
378 adding _d |
364 adding _d |
379 diff --git a/_d b/_d |
365 diff --git a/_d b/_d |
380 new file mode 100644 |
366 new file mode 100644 |
381 examine changes to '_d'? |
367 examine changes to '_d'? [Ynesfdaq?] q |
382 (enter ? for help) [Ynesfdaq?] q |
|
383 |
368 |
384 abort: user quit |
369 abort: user quit |
385 [255] |
370 [255] |
386 |
371 |
387 Running split with tip revision, specified as unnamed argument |
372 Running split with tip revision, specified as unnamed argument |
390 > EOF |
375 > EOF |
391 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
376 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
392 adding _d |
377 adding _d |
393 diff --git a/_d b/_d |
378 diff --git a/_d b/_d |
394 new file mode 100644 |
379 new file mode 100644 |
395 examine changes to '_d'? |
380 examine changes to '_d'? [Ynesfdaq?] q |
396 (enter ? for help) [Ynesfdaq?] q |
|
397 |
381 |
398 abort: user quit |
382 abort: user quit |
399 [255] |
383 [255] |
400 |
384 |
401 Running split with both unnamed and named revision arguments shows an error msg |
385 Running split with both unnamed and named revision arguments shows an error msg |
461 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
445 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
462 adding babar |
446 adding babar |
463 adding celeste |
447 adding celeste |
464 diff --git a/babar b/babar |
448 diff --git a/babar b/babar |
465 new file mode 100644 |
449 new file mode 100644 |
466 examine changes to 'babar'? |
450 examine changes to 'babar'? [Ynesfdaq?] Y |
467 (enter ? for help) [Ynesfdaq?] Y |
|
468 |
451 |
469 @@ -0,0 +1,1 @@ |
452 @@ -0,0 +1,1 @@ |
470 +babar |
453 +babar |
471 record change 1/2 to 'babar'? |
454 record change 1/2 to 'babar'? [Ynesfdaq?] Y |
472 (enter ? for help) [Ynesfdaq?] Y |
|
473 |
455 |
474 diff --git a/celeste b/celeste |
456 diff --git a/celeste b/celeste |
475 new file mode 100644 |
457 new file mode 100644 |
476 examine changes to 'celeste'? |
458 examine changes to 'celeste'? [Ynesfdaq?] N |
477 (enter ? for help) [Ynesfdaq?] N |
|
478 |
459 |
479 continue splitting? [Ycdq?] c |
460 continue splitting? [Ycdq?] c |
480 |
461 |
481 Check that the topic is still here |
462 Check that the topic is still here |
482 |
463 |
556 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
537 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
557 adding SPLIT1 |
538 adding SPLIT1 |
558 adding SPLIT2 |
539 adding SPLIT2 |
559 diff --git a/SPLIT1 b/SPLIT1 |
540 diff --git a/SPLIT1 b/SPLIT1 |
560 new file mode 100644 |
541 new file mode 100644 |
561 examine changes to 'SPLIT1'? |
542 examine changes to 'SPLIT1'? [Ynesfdaq?] Y |
562 (enter ? for help) [Ynesfdaq?] Y |
|
563 |
543 |
564 diff --git a/SPLIT2 b/SPLIT2 |
544 diff --git a/SPLIT2 b/SPLIT2 |
565 new file mode 100644 |
545 new file mode 100644 |
566 examine changes to 'SPLIT2'? |
546 examine changes to 'SPLIT2'? [Ynesfdaq?] N |
567 (enter ? for help) [Ynesfdaq?] N |
|
568 |
547 |
569 continue splitting? [Ycdq?] Y |
548 continue splitting? [Ycdq?] Y |
570 diff --git a/SPLIT2 b/SPLIT2 |
549 diff --git a/SPLIT2 b/SPLIT2 |
571 new file mode 100644 |
550 new file mode 100644 |
572 examine changes to 'SPLIT2'? |
551 examine changes to 'SPLIT2'? [Ynesfdaq?] Y |
573 (enter ? for help) [Ynesfdaq?] Y |
|
574 |
552 |
575 no more change to split |
553 no more change to split |
576 |
554 |
577 The split changesets should be on the 'another-branch' |
555 The split changesets should be on the 'another-branch' |
578 $ hg log -G -l 3 |
556 $ hg log -G -l 3 |
637 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
615 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
638 adding SPLIT3 |
616 adding SPLIT3 |
639 adding SPLIT4 |
617 adding SPLIT4 |
640 diff --git a/SPLIT3 b/SPLIT3 |
618 diff --git a/SPLIT3 b/SPLIT3 |
641 new file mode 100644 |
619 new file mode 100644 |
642 examine changes to 'SPLIT3'? |
620 examine changes to 'SPLIT3'? [Ynesfdaq?] Y |
643 (enter ? for help) [Ynesfdaq?] Y |
|
644 |
621 |
645 diff --git a/SPLIT4 b/SPLIT4 |
622 diff --git a/SPLIT4 b/SPLIT4 |
646 new file mode 100644 |
623 new file mode 100644 |
647 examine changes to 'SPLIT4'? |
624 examine changes to 'SPLIT4'? [Ynesfdaq?] q |
648 (enter ? for help) [Ynesfdaq?] q |
|
649 |
625 |
650 abort: user quit |
626 abort: user quit |
651 [255] |
627 [255] |
652 |
628 |
653 $ hg branch |
629 $ hg branch |
685 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
661 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
686 adding SPLIT3 |
662 adding SPLIT3 |
687 adding SPLIT4 |
663 adding SPLIT4 |
688 diff --git a/SPLIT3 b/SPLIT3 |
664 diff --git a/SPLIT3 b/SPLIT3 |
689 new file mode 100644 |
665 new file mode 100644 |
690 examine changes to 'SPLIT3'? |
666 examine changes to 'SPLIT3'? [Ynesfdaq?] Y |
691 (enter ? for help) [Ynesfdaq?] Y |
|
692 |
667 |
693 diff --git a/SPLIT4 b/SPLIT4 |
668 diff --git a/SPLIT4 b/SPLIT4 |
694 new file mode 100644 |
669 new file mode 100644 |
695 examine changes to 'SPLIT4'? |
670 examine changes to 'SPLIT4'? [Ynesfdaq?] ? |
696 (enter ? for help) [Ynesfdaq?] ? |
|
697 |
671 |
698 y - yes, record this change |
672 y - yes, record this change |
699 n - no, skip this change |
673 n - no, skip this change |
700 e - edit this change manually |
674 e - edit this change manually |
701 s - skip remaining changes to this file |
675 s - skip remaining changes to this file |
702 f - record remaining changes to this file |
676 f - record remaining changes to this file |
703 d - done, skip remaining changes and files |
677 d - done, skip remaining changes and files |
704 a - record all changes to all remaining files |
678 a - record all changes to all remaining files |
705 q - quit, recording no changes |
679 q - quit, recording no changes |
706 ? - ? (display help) |
680 ? - ? (display help) |
707 examine changes to 'SPLIT4'? |
681 examine changes to 'SPLIT4'? [Ynesfdaq?] d |
708 (enter ? for help) [Ynesfdaq?] d |
|
709 |
682 |
710 continue splitting? [Ycdq?] ? |
683 continue splitting? [Ycdq?] ? |
711 y - yes, continue selection |
684 y - yes, continue selection |
712 c - commit, select all remaining changes |
685 c - commit, select all remaining changes |
713 d - discard, discard remaining changes |
686 d - discard, discard remaining changes |
766 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
739 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
767 adding SPLIT2 |
740 adding SPLIT2 |
768 adding SPLIT3 |
741 adding SPLIT3 |
769 diff --git a/SPLIT2 b/SPLIT2 |
742 diff --git a/SPLIT2 b/SPLIT2 |
770 new file mode 100644 |
743 new file mode 100644 |
771 examine changes to 'SPLIT2'? |
744 examine changes to 'SPLIT2'? [Ynesfdaq?] Y |
772 (enter ? for help) [Ynesfdaq?] Y |
|
773 |
745 |
774 diff --git a/SPLIT3 b/SPLIT3 |
746 diff --git a/SPLIT3 b/SPLIT3 |
775 new file mode 100644 |
747 new file mode 100644 |
776 examine changes to 'SPLIT3'? |
748 examine changes to 'SPLIT3'? [Ynesfdaq?] d |
777 (enter ? for help) [Ynesfdaq?] d |
|
778 |
749 |
779 continue splitting? [Ycdq?] d |
750 continue splitting? [Ycdq?] d |
780 discarding remaining changes |
751 discarding remaining changes |
781 forgetting SPLIT3 |
752 forgetting SPLIT3 |
782 $ hg export |
753 $ hg export |
828 adding SPLIT4 |
799 adding SPLIT4 |
829 diff --git a/SPLIT2 b/SPLIT2 |
800 diff --git a/SPLIT2 b/SPLIT2 |
830 new file mode 100644 |
801 new file mode 100644 |
831 @@ -0,0 +1,1 @@ |
802 @@ -0,0 +1,1 @@ |
832 +sp2 |
803 +sp2 |
833 record change 1/2 to 'SPLIT2'? |
804 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y |
834 (enter ? for help) [Ynesfdaq?] y |
|
835 |
805 |
836 diff --git a/SPLIT3 b/SPLIT3 |
806 diff --git a/SPLIT3 b/SPLIT3 |
837 new file mode 100644 |
807 new file mode 100644 |
838 @@ -0,0 +1,1 @@ |
808 @@ -0,0 +1,1 @@ |
839 +sp3 |
809 +sp3 |
840 record change 2/2 to 'SPLIT3'? |
810 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s |
841 (enter ? for help) [Ynesfdaq?] s |
|
842 |
811 |
843 continue splitting? [Ycdq?] c |
812 continue splitting? [Ycdq?] c |
844 |
813 |
845 $ hg status --change '.~1' |
814 $ hg status --change '.~1' |
846 A SPLIT2 |
815 A SPLIT2 |
865 adding SPLIT4 |
834 adding SPLIT4 |
866 diff --git a/SPLIT2 b/SPLIT2 |
835 diff --git a/SPLIT2 b/SPLIT2 |
867 new file mode 100644 |
836 new file mode 100644 |
868 @@ -0,0 +1,1 @@ |
837 @@ -0,0 +1,1 @@ |
869 +sp2 |
838 +sp2 |
870 record change 1/2 to 'SPLIT2'? |
839 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y |
871 (enter ? for help) [Ynesfdaq?] y |
|
872 |
840 |
873 diff --git a/SPLIT3 b/SPLIT3 |
841 diff --git a/SPLIT3 b/SPLIT3 |
874 new file mode 100644 |
842 new file mode 100644 |
875 @@ -0,0 +1,1 @@ |
843 @@ -0,0 +1,1 @@ |
876 +sp3 |
844 +sp3 |
877 record change 2/2 to 'SPLIT3'? |
845 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s |
878 (enter ? for help) [Ynesfdaq?] s |
|
879 |
846 |
880 continue splitting? [Ycdq?] y |
847 continue splitting? [Ycdq?] y |
881 diff --git a/SPLIT3 b/SPLIT3 |
848 diff --git a/SPLIT3 b/SPLIT3 |
882 new file mode 100644 |
849 new file mode 100644 |
883 @@ -0,0 +1,1 @@ |
850 @@ -0,0 +1,1 @@ |
884 +sp3 |
851 +sp3 |
885 record this change to 'SPLIT3'? |
852 record this change to 'SPLIT3'? [Ynesfdaq?] y |
886 (enter ? for help) [Ynesfdaq?] y |
|
887 |
853 |
888 no more change to split |
854 no more change to split |
889 |
855 |
890 $ hg status --change '.~2' |
856 $ hg status --change '.~2' |
891 A SPLIT2 |
857 A SPLIT2 |
909 adding SPLIT4 |
875 adding SPLIT4 |
910 diff --git a/SPLIT2 b/SPLIT2 |
876 diff --git a/SPLIT2 b/SPLIT2 |
911 new file mode 100644 |
877 new file mode 100644 |
912 @@ -0,0 +1,1 @@ |
878 @@ -0,0 +1,1 @@ |
913 +sp2 |
879 +sp2 |
914 record change 1/2 to 'SPLIT2'? |
880 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y |
915 (enter ? for help) [Ynesfdaq?] y |
|
916 |
881 |
917 diff --git a/SPLIT3 b/SPLIT3 |
882 diff --git a/SPLIT3 b/SPLIT3 |
918 new file mode 100644 |
883 new file mode 100644 |
919 @@ -0,0 +1,1 @@ |
884 @@ -0,0 +1,1 @@ |
920 +sp3 |
885 +sp3 |
921 record change 2/2 to 'SPLIT3'? |
886 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y |
922 (enter ? for help) [Ynesfdaq?] y |
|
923 |
887 |
924 no more change to split |
888 no more change to split |
925 $ hg status --change '.~1' |
889 $ hg status --change '.~1' |
926 A SPLIT2 |
890 A SPLIT2 |
927 A SPLIT3 |
891 A SPLIT3 |
944 adding SPLIT4 |
908 adding SPLIT4 |
945 diff --git a/SPLIT2 b/SPLIT2 |
909 diff --git a/SPLIT2 b/SPLIT2 |
946 new file mode 100644 |
910 new file mode 100644 |
947 @@ -0,0 +1,1 @@ |
911 @@ -0,0 +1,1 @@ |
948 +sp2 |
912 +sp2 |
949 record change 1/2 to 'SPLIT2'? |
913 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y |
950 (enter ? for help) [Ynesfdaq?] y |
|
951 |
914 |
952 diff --git a/SPLIT3 b/SPLIT3 |
915 diff --git a/SPLIT3 b/SPLIT3 |
953 new file mode 100644 |
916 new file mode 100644 |
954 @@ -0,0 +1,1 @@ |
917 @@ -0,0 +1,1 @@ |
955 +sp3 |
918 +sp3 |
956 record change 2/2 to 'SPLIT3'? |
919 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s |
957 (enter ? for help) [Ynesfdaq?] s |
|
958 |
920 |
959 continue splitting? [Ycdq?] d |
921 continue splitting? [Ycdq?] d |
960 discarding remaining changes |
922 discarding remaining changes |
961 no more change to split |
923 no more change to split |
962 $ hg status --change '.~1' |
924 $ hg status --change '.~1' |
1094 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1056 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
1095 adding a |
1057 adding a |
1096 adding b |
1058 adding b |
1097 diff --git a/a b/a |
1059 diff --git a/a b/a |
1098 new file mode 100644 |
1060 new file mode 100644 |
1099 examine changes to 'a'? |
1061 examine changes to 'a'? [Ynesfdaq?] y |
1100 (enter ? for help) [Ynesfdaq?] y |
|
1101 |
1062 |
1102 @@ -0,0 +1,1 @@ |
1063 @@ -0,0 +1,1 @@ |
1103 +a |
1064 +a |
1104 record change 1/2 to 'a'? |
1065 record change 1/2 to 'a'? [Ynesfdaq?] y |
1105 (enter ? for help) [Ynesfdaq?] y |
|
1106 |
1066 |
1107 diff --git a/b b/b |
1067 diff --git a/b b/b |
1108 new file mode 100644 |
1068 new file mode 100644 |
1109 examine changes to 'b'? |
1069 examine changes to 'b'? [Ynesfdaq?] n |
1110 (enter ? for help) [Ynesfdaq?] n |
|
1111 |
1070 |
1112 created new head |
1071 created new head |
1113 (consider using topic for lightweight branches. See 'hg help topic') |
1072 (consider using topic for lightweight branches. See 'hg help topic') |
1114 continue splitting? [Ycdq?] y |
1073 continue splitting? [Ycdq?] y |
1115 diff --git a/b b/b |
1074 diff --git a/b b/b |
1116 new file mode 100644 |
1075 new file mode 100644 |
1117 examine changes to 'b'? |
1076 examine changes to 'b'? [Ynesfdaq?] y |
1118 (enter ? for help) [Ynesfdaq?] y |
|
1119 |
1077 |
1120 @@ -0,0 +1,1 @@ |
1078 @@ -0,0 +1,1 @@ |
1121 +b |
1079 +b |
1122 record this change to 'b'? |
1080 record this change to 'b'? [Ynesfdaq?] y |
1123 (enter ? for help) [Ynesfdaq?] y |
|
1124 |
1081 |
1125 no more change to split |
1082 no more change to split |
1126 1 new orphan changesets |
1083 1 new orphan changesets |
1127 |
1084 |
1128 $ hg glog -p |
1085 $ hg glog -p |
1241 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1198 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1242 adding b |
1199 adding b |
1243 adding c |
1200 adding c |
1244 diff --git a/b b/b |
1201 diff --git a/b b/b |
1245 new file mode 100644 |
1202 new file mode 100644 |
1246 examine changes to 'b'? |
1203 examine changes to 'b'? [Ynesfdaq?] y |
1247 (enter ? for help) [Ynesfdaq?] y |
|
1248 |
1204 |
1249 @@ -0,0 +1,1 @@ |
1205 @@ -0,0 +1,1 @@ |
1250 +b |
1206 +b |
1251 record change 1/2 to 'b'? |
1207 record change 1/2 to 'b'? [Ynesfdaq?] y |
1252 (enter ? for help) [Ynesfdaq?] y |
|
1253 |
1208 |
1254 diff --git a/c b/c |
1209 diff --git a/c b/c |
1255 new file mode 100644 |
1210 new file mode 100644 |
1256 examine changes to 'c'? |
1211 examine changes to 'c'? [Ynesfdaq?] n |
1257 (enter ? for help) [Ynesfdaq?] n |
|
1258 |
1212 |
1259 created new head |
1213 created new head |
1260 (consider using topic for lightweight branches. See 'hg help topic') |
1214 (consider using topic for lightweight branches. See 'hg help topic') |
1261 continue splitting? [Ycdq?] c |
1215 continue splitting? [Ycdq?] c |
1262 |
1216 |