Mercurial > evolve

comparison tests/test-split.t @ 5898:91207a1c4dfa mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 21:34:57 +0800
parents 67fc03f42d92
children d161fccccd80 e82ad19eb3cc
comparison
equal deleted inserted replaced
5897:888bed8033f1 5898:91207a1c4dfa
56 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 56 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
57 reverting _a 57 reverting _a
58 adding _d 58 adding _d
59 diff --git a/_a b/_a 59 diff --git a/_a b/_a
60 1 hunks, 1 lines changed 60 1 hunks, 1 lines changed
61 examine changes to '_a'? 61 examine changes to '_a'? [Ynesfdaq?] y
62 (enter ? for help) [Ynesfdaq?] y
63 62
64 @@ -1,0 +2,1 @@ 63 @@ -1,0 +2,1 @@
65 +change to a 64 +change to a
66 record change 1/2 to '_a'? 65 record change 1/2 to '_a'? [Ynesfdaq?] y
67 (enter ? for help) [Ynesfdaq?] y
68 66
69 diff --git a/_d b/_d 67 diff --git a/_d b/_d
70 new file mode 100644 68 new file mode 100644
71 examine changes to '_d'? 69 examine changes to '_d'? [Ynesfdaq?] y
72 (enter ? for help) [Ynesfdaq?] y
73 70
74 @@ -0,0 +1,1 @@ 71 @@ -0,0 +1,1 @@
75 +_d 72 +_d
76 record change 2/2 to '_d'? 73 record change 2/2 to '_d'? [Ynesfdaq?] n
77 (enter ? for help) [Ynesfdaq?] n
78 74
79 created new head 75 created new head
80 continue splitting? [Ycdq?] Y 76 continue splitting? [Ycdq?] Y
81 diff --git a/_d b/_d 77 diff --git a/_d b/_d
82 new file mode 100644 78 new file mode 100644
83 examine changes to '_d'? 79 examine changes to '_d'? [Ynesfdaq?] y
84 (enter ? for help) [Ynesfdaq?] y
85 80
86 @@ -0,0 +1,1 @@ 81 @@ -0,0 +1,1 @@
87 +_d 82 +_d
88 record this change to '_d'? 83 record this change to '_d'? [Ynesfdaq?] y
89 (enter ? for help) [Ynesfdaq?] y
90 84
91 no more change to split 85 no more change to split
92 86
93 $ hg debugobsolete 87 $ hg debugobsolete
94 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 88 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
184 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 178 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
185 reverting _b 179 reverting _b
186 adding _c 180 adding _c
187 diff --git a/_b b/_b 181 diff --git a/_b b/_b
188 1 hunks, 1 lines changed 182 1 hunks, 1 lines changed
189 examine changes to '_b'? 183 examine changes to '_b'? [Ynesfdaq?] y
190 (enter ? for help) [Ynesfdaq?] y
191 184
192 @@ -1,0 +2,1 @@ 185 @@ -1,0 +2,1 @@
193 +change to b 186 +change to b
194 record change 1/2 to '_b'? 187 record change 1/2 to '_b'? [Ynesfdaq?] y
195 (enter ? for help) [Ynesfdaq?] y
196 188
197 diff --git a/_c b/_c 189 diff --git a/_c b/_c
198 new file mode 100644 190 new file mode 100644
199 examine changes to '_c'? 191 examine changes to '_c'? [Ynesfdaq?] y
200 (enter ? for help) [Ynesfdaq?] y
201 192
202 @@ -0,0 +1,1 @@ 193 @@ -0,0 +1,1 @@
203 +_c 194 +_c
204 record change 2/2 to '_c'? 195 record change 2/2 to '_c'? [Ynesfdaq?] n
205 (enter ? for help) [Ynesfdaq?] n
206 196
207 created new head 197 created new head
208 continue splitting? [Ycdq?] c 198 continue splitting? [Ycdq?] c
209 2 new orphan changesets 199 2 new orphan changesets
210 200
291 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 281 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
292 reverting _a 282 reverting _a
293 adding _d 283 adding _d
294 diff --git a/_a b/_a 284 diff --git a/_a b/_a
295 1 hunks, 2 lines changed 285 1 hunks, 2 lines changed
296 examine changes to '_a'? 286 examine changes to '_a'? [Ynesfdaq?] y
297 (enter ? for help) [Ynesfdaq?] y
298 287
299 @@ -1,2 +1,1 @@ 288 @@ -1,2 +1,1 @@
300 -_a 289 -_a
301 -change to a 290 -change to a
302 +changetofilea 291 +changetofilea
303 record change 1/2 to '_a'? 292 record change 1/2 to '_a'? [Ynesfdaq?] y
304 (enter ? for help) [Ynesfdaq?] y
305 293
306 diff --git a/_d b/_d 294 diff --git a/_d b/_d
307 new file mode 100644 295 new file mode 100644
308 examine changes to '_d'? 296 examine changes to '_d'? [Ynesfdaq?] n
309 (enter ? for help) [Ynesfdaq?] n
310 297
311 created new head 298 created new head
312 continue splitting? [Ycdq?] c 299 continue splitting? [Ycdq?] c
313 $ hg log -G -r "3f134f739075::" 300 $ hg log -G -r "3f134f739075::"
314 @ changeset: 16:452a26648478 301 @ changeset: 16:452a26648478
339 (leaving bookmark bookB) 326 (leaving bookmark bookB)
340 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
341 adding _d 328 adding _d
342 diff --git a/_d b/_d 329 diff --git a/_d b/_d
343 new file mode 100644 330 new file mode 100644
344 examine changes to '_d'? 331 examine changes to '_d'? [Ynesfdaq?] abort: response expected
345 (enter ? for help) [Ynesfdaq?] abort: response expected
346 [255] 332 [255]
347 333
348 Cannot split a commit that is not a head if instability is not allowed 334 Cannot split a commit that is not a head if instability is not allowed
349 $ cat >> $HGRCPATH <<EOF 335 $ cat >> $HGRCPATH <<EOF
350 > [experimental] 336 > [experimental]
366 > EOF 352 > EOF
367 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
368 adding _d 354 adding _d
369 diff --git a/_d b/_d 355 diff --git a/_d b/_d
370 new file mode 100644 356 new file mode 100644
371 examine changes to '_d'? 357 examine changes to '_d'? [Ynesfdaq?] q
372 (enter ? for help) [Ynesfdaq?] q
373 358
374 abort: user quit 359 abort: user quit
375 [255] 360 [255]
376 361
377 Running split with tip revision, specified as unnamed argument 362 Running split with tip revision, specified as unnamed argument
380 > EOF 365 > EOF
381 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 366 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
382 adding _d 367 adding _d
383 diff --git a/_d b/_d 368 diff --git a/_d b/_d
384 new file mode 100644 369 new file mode 100644
385 examine changes to '_d'? 370 examine changes to '_d'? [Ynesfdaq?] q
386 (enter ? for help) [Ynesfdaq?] q
387 371
388 abort: user quit 372 abort: user quit
389 [255] 373 [255]
390 374
391 Running split with both unnamed and named revision arguments shows an error msg 375 Running split with both unnamed and named revision arguments shows an error msg
451 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 435 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
452 adding babar 436 adding babar
453 adding celeste 437 adding celeste
454 diff --git a/babar b/babar 438 diff --git a/babar b/babar
455 new file mode 100644 439 new file mode 100644
456 examine changes to 'babar'? 440 examine changes to 'babar'? [Ynesfdaq?] Y
457 (enter ? for help) [Ynesfdaq?] Y
458 441
459 @@ -0,0 +1,1 @@ 442 @@ -0,0 +1,1 @@
460 +babar 443 +babar
461 record change 1/2 to 'babar'? 444 record change 1/2 to 'babar'? [Ynesfdaq?] Y
462 (enter ? for help) [Ynesfdaq?] Y
463 445
464 diff --git a/celeste b/celeste 446 diff --git a/celeste b/celeste
465 new file mode 100644 447 new file mode 100644
466 examine changes to 'celeste'? 448 examine changes to 'celeste'? [Ynesfdaq?] N
467 (enter ? for help) [Ynesfdaq?] N
468 449
469 continue splitting? [Ycdq?] c 450 continue splitting? [Ycdq?] c
470 451
471 Check that the topic is still here 452 Check that the topic is still here
472 453
546 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 527 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
547 adding SPLIT1 528 adding SPLIT1
548 adding SPLIT2 529 adding SPLIT2
549 diff --git a/SPLIT1 b/SPLIT1 530 diff --git a/SPLIT1 b/SPLIT1
550 new file mode 100644 531 new file mode 100644
551 examine changes to 'SPLIT1'? 532 examine changes to 'SPLIT1'? [Ynesfdaq?] Y
552 (enter ? for help) [Ynesfdaq?] Y
553 533
554 diff --git a/SPLIT2 b/SPLIT2 534 diff --git a/SPLIT2 b/SPLIT2
555 new file mode 100644 535 new file mode 100644
556 examine changes to 'SPLIT2'? 536 examine changes to 'SPLIT2'? [Ynesfdaq?] N
557 (enter ? for help) [Ynesfdaq?] N
558 537
559 continue splitting? [Ycdq?] Y 538 continue splitting? [Ycdq?] Y
560 diff --git a/SPLIT2 b/SPLIT2 539 diff --git a/SPLIT2 b/SPLIT2
561 new file mode 100644 540 new file mode 100644
562 examine changes to 'SPLIT2'? 541 examine changes to 'SPLIT2'? [Ynesfdaq?] Y
563 (enter ? for help) [Ynesfdaq?] Y
564 542
565 no more change to split 543 no more change to split
566 544
567 The split changesets should be on the 'another-branch' 545 The split changesets should be on the 'another-branch'
568 $ hg log -G -l 3 546 $ hg log -G -l 3
627 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 605 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
628 adding SPLIT3 606 adding SPLIT3
629 adding SPLIT4 607 adding SPLIT4
630 diff --git a/SPLIT3 b/SPLIT3 608 diff --git a/SPLIT3 b/SPLIT3
631 new file mode 100644 609 new file mode 100644
632 examine changes to 'SPLIT3'? 610 examine changes to 'SPLIT3'? [Ynesfdaq?] Y
633 (enter ? for help) [Ynesfdaq?] Y
634 611
635 diff --git a/SPLIT4 b/SPLIT4 612 diff --git a/SPLIT4 b/SPLIT4
636 new file mode 100644 613 new file mode 100644
637 examine changes to 'SPLIT4'? 614 examine changes to 'SPLIT4'? [Ynesfdaq?] q
638 (enter ? for help) [Ynesfdaq?] q
639 615
640 abort: user quit 616 abort: user quit
641 [255] 617 [255]
642 618
643 $ hg branch 619 $ hg branch
675 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 651 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
676 adding SPLIT3 652 adding SPLIT3
677 adding SPLIT4 653 adding SPLIT4
678 diff --git a/SPLIT3 b/SPLIT3 654 diff --git a/SPLIT3 b/SPLIT3
679 new file mode 100644 655 new file mode 100644
680 examine changes to 'SPLIT3'? 656 examine changes to 'SPLIT3'? [Ynesfdaq?] Y
681 (enter ? for help) [Ynesfdaq?] Y
682 657
683 diff --git a/SPLIT4 b/SPLIT4 658 diff --git a/SPLIT4 b/SPLIT4
684 new file mode 100644 659 new file mode 100644
685 examine changes to 'SPLIT4'? 660 examine changes to 'SPLIT4'? [Ynesfdaq?] ?
686 (enter ? for help) [Ynesfdaq?] ?
687 661
688 y - yes, record this change 662 y - yes, record this change
689 n - no, skip this change 663 n - no, skip this change
690 e - edit this change manually 664 e - edit this change manually
691 s - skip remaining changes to this file 665 s - skip remaining changes to this file
692 f - record remaining changes to this file 666 f - record remaining changes to this file
693 d - done, skip remaining changes and files 667 d - done, skip remaining changes and files
694 a - record all changes to all remaining files 668 a - record all changes to all remaining files
695 q - quit, recording no changes 669 q - quit, recording no changes
696 ? - ? (display help) 670 ? - ? (display help)
697 examine changes to 'SPLIT4'? 671 examine changes to 'SPLIT4'? [Ynesfdaq?] d
698 (enter ? for help) [Ynesfdaq?] d
699 672
700 continue splitting? [Ycdq?] ? 673 continue splitting? [Ycdq?] ?
701 y - yes, continue selection 674 y - yes, continue selection
702 c - commit, select all remaining changes 675 c - commit, select all remaining changes
703 d - discard, discard remaining changes 676 d - discard, discard remaining changes
756 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 729 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
757 adding SPLIT2 730 adding SPLIT2
758 adding SPLIT3 731 adding SPLIT3
759 diff --git a/SPLIT2 b/SPLIT2 732 diff --git a/SPLIT2 b/SPLIT2
760 new file mode 100644 733 new file mode 100644
761 examine changes to 'SPLIT2'? 734 examine changes to 'SPLIT2'? [Ynesfdaq?] Y
762 (enter ? for help) [Ynesfdaq?] Y
763 735
764 diff --git a/SPLIT3 b/SPLIT3 736 diff --git a/SPLIT3 b/SPLIT3
765 new file mode 100644 737 new file mode 100644
766 examine changes to 'SPLIT3'? 738 examine changes to 'SPLIT3'? [Ynesfdaq?] d
767 (enter ? for help) [Ynesfdaq?] d
768 739
769 continue splitting? [Ycdq?] d 740 continue splitting? [Ycdq?] d
770 discarding remaining changes 741 discarding remaining changes
771 forgetting SPLIT3 742 forgetting SPLIT3
772 $ hg export 743 $ hg export
818 adding SPLIT4 789 adding SPLIT4
819 diff --git a/SPLIT2 b/SPLIT2 790 diff --git a/SPLIT2 b/SPLIT2
820 new file mode 100644 791 new file mode 100644
821 @@ -0,0 +1,1 @@ 792 @@ -0,0 +1,1 @@
822 +sp2 793 +sp2
823 record change 1/2 to 'SPLIT2'? 794 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
824 (enter ? for help) [Ynesfdaq?] y
825 795
826 diff --git a/SPLIT3 b/SPLIT3 796 diff --git a/SPLIT3 b/SPLIT3
827 new file mode 100644 797 new file mode 100644
828 @@ -0,0 +1,1 @@ 798 @@ -0,0 +1,1 @@
829 +sp3 799 +sp3
830 record change 2/2 to 'SPLIT3'? 800 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
831 (enter ? for help) [Ynesfdaq?] s
832 801
833 continue splitting? [Ycdq?] c 802 continue splitting? [Ycdq?] c
834 803
835 $ hg status --change '.~1' 804 $ hg status --change '.~1'
836 A SPLIT2 805 A SPLIT2
855 adding SPLIT4 824 adding SPLIT4
856 diff --git a/SPLIT2 b/SPLIT2 825 diff --git a/SPLIT2 b/SPLIT2
857 new file mode 100644 826 new file mode 100644
858 @@ -0,0 +1,1 @@ 827 @@ -0,0 +1,1 @@
859 +sp2 828 +sp2
860 record change 1/2 to 'SPLIT2'? 829 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
861 (enter ? for help) [Ynesfdaq?] y
862 830
863 diff --git a/SPLIT3 b/SPLIT3 831 diff --git a/SPLIT3 b/SPLIT3
864 new file mode 100644 832 new file mode 100644
865 @@ -0,0 +1,1 @@ 833 @@ -0,0 +1,1 @@
866 +sp3 834 +sp3
867 record change 2/2 to 'SPLIT3'? 835 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
868 (enter ? for help) [Ynesfdaq?] s
869 836
870 continue splitting? [Ycdq?] y 837 continue splitting? [Ycdq?] y
871 diff --git a/SPLIT3 b/SPLIT3 838 diff --git a/SPLIT3 b/SPLIT3
872 new file mode 100644 839 new file mode 100644
873 @@ -0,0 +1,1 @@ 840 @@ -0,0 +1,1 @@
874 +sp3 841 +sp3
875 record this change to 'SPLIT3'? 842 record this change to 'SPLIT3'? [Ynesfdaq?] y
876 (enter ? for help) [Ynesfdaq?] y
877 843
878 no more change to split 844 no more change to split
879 845
880 $ hg status --change '.~2' 846 $ hg status --change '.~2'
881 A SPLIT2 847 A SPLIT2
899 adding SPLIT4 865 adding SPLIT4
900 diff --git a/SPLIT2 b/SPLIT2 866 diff --git a/SPLIT2 b/SPLIT2
901 new file mode 100644 867 new file mode 100644
902 @@ -0,0 +1,1 @@ 868 @@ -0,0 +1,1 @@
903 +sp2 869 +sp2
904 record change 1/2 to 'SPLIT2'? 870 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
905 (enter ? for help) [Ynesfdaq?] y
906 871
907 diff --git a/SPLIT3 b/SPLIT3 872 diff --git a/SPLIT3 b/SPLIT3
908 new file mode 100644 873 new file mode 100644
909 @@ -0,0 +1,1 @@ 874 @@ -0,0 +1,1 @@
910 +sp3 875 +sp3
911 record change 2/2 to 'SPLIT3'? 876 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
912 (enter ? for help) [Ynesfdaq?] y
913 877
914 no more change to split 878 no more change to split
915 $ hg status --change '.~1' 879 $ hg status --change '.~1'
916 A SPLIT2 880 A SPLIT2
917 A SPLIT3 881 A SPLIT3
934 adding SPLIT4 898 adding SPLIT4
935 diff --git a/SPLIT2 b/SPLIT2 899 diff --git a/SPLIT2 b/SPLIT2
936 new file mode 100644 900 new file mode 100644
937 @@ -0,0 +1,1 @@ 901 @@ -0,0 +1,1 @@
938 +sp2 902 +sp2
939 record change 1/2 to 'SPLIT2'? 903 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
940 (enter ? for help) [Ynesfdaq?] y
941 904
942 diff --git a/SPLIT3 b/SPLIT3 905 diff --git a/SPLIT3 b/SPLIT3
943 new file mode 100644 906 new file mode 100644
944 @@ -0,0 +1,1 @@ 907 @@ -0,0 +1,1 @@
945 +sp3 908 +sp3
946 record change 2/2 to 'SPLIT3'? 909 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
947 (enter ? for help) [Ynesfdaq?] s
948 910
949 continue splitting? [Ycdq?] d 911 continue splitting? [Ycdq?] d
950 discarding remaining changes 912 discarding remaining changes
951 no more change to split 913 no more change to split
952 $ hg status --change '.~1' 914 $ hg status --change '.~1'
1084 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 1046 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
1085 adding a 1047 adding a
1086 adding b 1048 adding b
1087 diff --git a/a b/a 1049 diff --git a/a b/a
1088 new file mode 100644 1050 new file mode 100644
1089 examine changes to 'a'? 1051 examine changes to 'a'? [Ynesfdaq?] y
1090 (enter ? for help) [Ynesfdaq?] y
1091 1052
1092 @@ -0,0 +1,1 @@ 1053 @@ -0,0 +1,1 @@
1093 +a 1054 +a
1094 record change 1/2 to 'a'? 1055 record change 1/2 to 'a'? [Ynesfdaq?] y
1095 (enter ? for help) [Ynesfdaq?] y
1096 1056
1097 diff --git a/b b/b 1057 diff --git a/b b/b
1098 new file mode 100644 1058 new file mode 100644
1099 examine changes to 'b'? 1059 examine changes to 'b'? [Ynesfdaq?] n
1100 (enter ? for help) [Ynesfdaq?] n
1101 1060
1102 created new head 1061 created new head
1103 (consider using topic for lightweight branches. See 'hg help topic') 1062 (consider using topic for lightweight branches. See 'hg help topic')
1104 continue splitting? [Ycdq?] y 1063 continue splitting? [Ycdq?] y
1105 diff --git a/b b/b 1064 diff --git a/b b/b
1106 new file mode 100644 1065 new file mode 100644
1107 examine changes to 'b'? 1066 examine changes to 'b'? [Ynesfdaq?] y
1108 (enter ? for help) [Ynesfdaq?] y
1109 1067
1110 @@ -0,0 +1,1 @@ 1068 @@ -0,0 +1,1 @@
1111 +b 1069 +b
1112 record this change to 'b'? 1070 record this change to 'b'? [Ynesfdaq?] y
1113 (enter ? for help) [Ynesfdaq?] y
1114 1071
1115 no more change to split 1072 no more change to split
1116 1 new orphan changesets 1073 1 new orphan changesets
1117 1074
1118 $ hg glog -p 1075 $ hg glog -p
1231 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 1188 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1232 adding b 1189 adding b
1233 adding c 1190 adding c
1234 diff --git a/b b/b 1191 diff --git a/b b/b
1235 new file mode 100644 1192 new file mode 100644
1236 examine changes to 'b'? 1193 examine changes to 'b'? [Ynesfdaq?] y
1237 (enter ? for help) [Ynesfdaq?] y
1238 1194
1239 @@ -0,0 +1,1 @@ 1195 @@ -0,0 +1,1 @@
1240 +b 1196 +b
1241 record change 1/2 to 'b'? 1197 record change 1/2 to 'b'? [Ynesfdaq?] y
1242 (enter ? for help) [Ynesfdaq?] y
1243 1198
1244 diff --git a/c b/c 1199 diff --git a/c b/c
1245 new file mode 100644 1200 new file mode 100644
1246 examine changes to 'c'? 1201 examine changes to 'c'? [Ynesfdaq?] n
1247 (enter ? for help) [Ynesfdaq?] n
1248 1202
1249 created new head 1203 created new head
1250 (consider using topic for lightweight branches. See 'hg help topic') 1204 (consider using topic for lightweight branches. See 'hg help topic')
1251 continue splitting? [Ycdq?] c 1205 continue splitting? [Ycdq?] c
1252 1206
1311 adding a 1265 adding a
1312 adding b 1266 adding b
1313 adding c 1267 adding c
1314 diff --git a/a b/a 1268 diff --git a/a b/a
1315 new file mode 100644 1269 new file mode 100644
1316 examine changes to 'a'? 1270 examine changes to 'a'? [Ynesfdaq?] f
1317 (enter ? for help) [Ynesfdaq?] f
1318 1271
1319 diff --git a/b b/b 1272 diff --git a/b b/b
1320 new file mode 100644 1273 new file mode 100644
1321 examine changes to 'b'? 1274 examine changes to 'b'? [Ynesfdaq?] d
1322 (enter ? for help) [Ynesfdaq?] d
1323 1275
1324 created new head 1276 created new head
1325 (consider using topic for lightweight branches. See 'hg help topic') 1277 (consider using topic for lightweight branches. See 'hg help topic')
1326 continue splitting? [Ycdq?] y 1278 continue splitting? [Ycdq?] y
1327 diff --git a/b b/b 1279 diff --git a/b b/b
1328 new file mode 100644 1280 new file mode 100644
1329 examine changes to 'b'? 1281 examine changes to 'b'? [Ynesfdaq?] f
1330 (enter ? for help) [Ynesfdaq?] f
1331 1282
1332 diff --git a/c b/c 1283 diff --git a/c b/c
1333 new file mode 100644 1284 new file mode 100644
1334 examine changes to 'c'? 1285 examine changes to 'c'? [Ynesfdaq?] d
1335 (enter ? for help) [Ynesfdaq?] d
1336 1286
1337 continue splitting? [Ycdq?] d 1287 continue splitting? [Ycdq?] d
1338 discarding remaining changes 1288 discarding remaining changes
1339 forgetting c 1289 forgetting c
1340 1290