309 Case with some of the topic unstable |
309 Case with some of the topic unstable |
310 ------------------------------------ |
310 ------------------------------------ |
311 |
311 |
312 $ echo bbb > ddd |
312 $ echo bbb > ddd |
313 $ hg commit --amend |
313 $ hg commit --amend |
314 2 new orphan changesets |
|
315 $ hg log -G |
314 $ hg log -G |
316 @ 6 default {foo} draft c_d |
315 @ 6 default {foo} draft c_d |
317 | |
316 | |
318 | * 5 default {foo} draft c_f |
317 | o 5 default {foo} draft c_f |
319 | | |
318 | | |
320 | * 4 default {foo} draft c_e |
319 | o 4 default {foo} draft c_e |
321 | | |
320 | | |
322 | x 3 default {foo} draft c_d |
321 | x 3 default {foo} draft c_d |
323 |/ |
322 |/ |
324 o 2 default {foo} draft c_c |
323 o 2 default {foo} draft c_c |
325 | |
324 | |
444 |
443 |
445 $ hg up 'desc(c_d)' |
444 $ hg up 'desc(c_d)' |
446 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 |
447 $ echo ccc > ddd |
446 $ echo ccc > ddd |
448 $ hg commit --amend -m 'c_D' |
447 $ hg commit --amend -m 'c_D' |
449 4 new orphan changesets |
|
450 $ hg rebase -d . -s 'desc(c_g)' |
448 $ hg rebase -d . -s 'desc(c_g)' |
451 rebasing 9:81264ae8a36a "c_g" (foo) |
449 rebasing 9:81264ae8a36a "c_g" (foo) |
452 rebasing 10:fde5f5941642 "c_h" (foo) |
450 rebasing 10:fde5f5941642 "c_h" (foo) |
453 $ hg log -G |
451 $ hg log -G |
454 o 13 default {foo} draft c_h |
452 o 13 default {foo} draft c_h |
455 | |
453 | |
456 o 12 default {foo} draft c_g |
454 o 12 default {foo} draft c_g |
457 | |
455 | |
458 @ 11 default {foo} draft c_D |
456 @ 11 default {foo} draft c_D |
459 | |
457 | |
460 | * 8 default {foo} draft c_f |
458 | o 8 default {foo} draft c_f |
461 | | |
459 | | |
462 | * 7 default {foo} draft c_e |
460 | o 7 default {foo} draft c_e |
463 | | |
461 | | |
464 | x 6 default {foo} draft c_d |
462 | x 6 default {foo} draft c_d |
465 |/ |
463 |/ |
466 o 2 default {foo} draft c_c |
464 o 2 default {foo} draft c_c |
467 | |
465 | |
498 | |
496 | |
499 o 12 default {foo} draft c_g |
497 o 12 default {foo} draft c_g |
500 | |
498 | |
501 @ 11 default {foo} draft c_D |
499 @ 11 default {foo} draft c_D |
502 | |
500 | |
503 | * 8 default {foo} draft c_f |
501 | o 8 default {foo} draft c_f |
504 | | |
502 | | |
505 | * 7 default {foo} draft c_e |
503 | o 7 default {foo} draft c_e |
506 | | |
504 | | |
507 | x 6 default {foo} draft c_d |
505 | x 6 default {foo} draft c_d |
508 |/ |
506 |/ |
509 o 2 default {foo} draft c_c |
507 o 2 default {foo} draft c_c |
510 | |
508 | |
535 o 0 default {} public c_a |
533 o 0 default {} public c_a |
536 |
534 |
537 Changing topics on some commits in between |
535 Changing topics on some commits in between |
538 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
536 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
539 switching to topic foobar |
537 switching to topic foobar |
540 4 new orphan changesets |
|
541 changed topic on 2 changesets to "foobar" |
538 changed topic on 2 changesets to "foobar" |
542 $ hg log -G |
539 $ hg log -G |
543 @ 17 default {foobar} draft c_D |
540 @ 17 default {foobar} draft c_D |
544 | |
541 | |
545 | * 16 default {foobar} draft c_e |
542 | o 16 default {foobar} draft c_e |
546 | | |
543 | | |
547 | | * 15 default {foo} draft c_f |
544 | | o 15 default {foo} draft c_f |
548 | | | |
545 | | | |
549 | | x 14 default {foo} draft c_e |
546 | | x 14 default {foo} draft c_e |
550 | |/ |
547 | |/ |
551 | * 13 default {foo} draft c_h |
548 | o 13 default {foo} draft c_h |
552 | | |
549 | | |
553 | * 12 default {foo} draft c_g |
550 | o 12 default {foo} draft c_g |
554 | | |
551 | | |
555 | x 11 default {foo} draft c_D |
552 | x 11 default {foo} draft c_D |
556 |/ |
553 |/ |
557 o 2 default {foo} draft c_c |
554 o 2 default {foo} draft c_c |
558 | |
555 | |
561 o 0 default {} public c_a |
558 o 0 default {} public c_a |
562 |
559 |
563 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
560 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
564 rebasing 15:77082e55de88 "c_f" (foo) |
561 rebasing 15:77082e55de88 "c_f" (foo) |
565 switching to topic foo |
562 switching to topic foo |
566 1 new orphan changesets |
|
567 switching to topic foobar |
563 switching to topic foobar |
568 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
564 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
569 rebasing 12:0c3e8aed985d "c_g" (foo) |
565 rebasing 12:0c3e8aed985d "c_g" (foo) |
570 switching to topic foo |
566 switching to topic foo |
571 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
567 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
715 |
711 |
716 $ hg up 'desc("c_B")' |
712 $ hg up 'desc("c_B")' |
717 switching to topic red |
713 switching to topic red |
718 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
714 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
719 $ hg commit --amend --user test2 |
715 $ hg commit --amend --user test2 |
720 7 new orphan changesets |
|
721 $ hg up 'desc("c_C")' |
716 $ hg up 'desc("c_C")' |
722 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
717 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
723 $ hg commit --amend --user test2 |
718 $ hg commit --amend --user test2 |
724 $ hg up 'desc("c_D")' |
719 $ hg up 'desc("c_D")' |
725 switching to topic blue |
720 switching to topic blue |
727 $ hg commit --amend --user test2 |
722 $ hg commit --amend --user test2 |
728 |
723 |
729 $ hg log -G --rev 'sort(all(), "topo")' |
724 $ hg log -G --rev 'sort(all(), "topo")' |
730 @ 11 default {blue} draft c_D |
725 @ 11 default {blue} draft c_D |
731 | |
726 | |
732 | * 8 default {blue} draft c_I |
727 | o 8 default {blue} draft c_I |
733 | | |
728 | | |
734 | * 7 default {red} draft c_H |
729 | o 7 default {red} draft c_H |
735 | |\ |
730 | |\ |
736 | | * 6 default {blue} draft c_G |
731 | | o 6 default {blue} draft c_G |
737 | | | |
732 | | | |
738 | | * 5 default {red} draft c_F |
733 | | o 5 default {red} draft c_F |
739 | | | |
734 | | | |
740 | | * 4 default {red} draft c_E |
735 | | o 4 default {red} draft c_E |
741 | | | |
736 | | | |
742 | x | 3 default {blue} draft c_D |
737 | x | 3 default {blue} draft c_D |
743 |/ / |
738 |/ / |
744 x / 2 default {red} draft c_C |
739 x / 2 default {red} draft c_C |
745 |/ |
740 |/ |
746 | * 10 default {red} draft c_C |
741 | o 10 default {red} draft c_C |
747 |/ |
742 |/ |
748 x 1 default {red} draft c_B |
743 x 1 default {red} draft c_B |
749 | |
744 | |
750 | o 9 default {red} draft c_B |
745 | o 9 default {red} draft c_B |
751 |/ |
746 |/ |
797 $ hg commit --amend --user test3 |
792 $ hg commit --amend --user test3 |
798 |
793 |
799 $ hg log -G --rev 'sort(all(), "topo")' |
794 $ hg log -G --rev 'sort(all(), "topo")' |
800 @ 16 default {blue} draft c_D |
795 @ 16 default {blue} draft c_D |
801 | |
796 | |
802 | * 13 default {blue} draft c_G |
797 | o 13 default {blue} draft c_G |
803 | | |
798 | | |
804 | | * 12 default {red} draft c_H |
799 | | o 12 default {red} draft c_H |
805 | | |\ |
800 | | |\ |
806 | | | | * 8 default {blue} draft c_I |
801 | | | | o 8 default {blue} draft c_I |
807 | | | | | |
802 | | | | | |
808 | | +---x 7 default {red} draft c_H |
803 | | +---x 7 default {red} draft c_H |
809 | | | |/ |
804 | | | |/ |
810 | +---x 6 default {blue} draft c_G |
805 | +---x 6 default {blue} draft c_G |
811 | | | |
806 | | | |
812 | * | 5 default {red} draft c_F |
807 | o | 5 default {red} draft c_F |
813 | | | |
808 | | | |
814 | * | 4 default {red} draft c_E |
809 | o | 4 default {red} draft c_E |
815 | | | |
810 | | | |
816 +---x 3 default {blue} draft c_D |
811 +---x 3 default {blue} draft c_D |
817 | | |
812 | | |
818 x | 2 default {red} draft c_C |
813 x | 2 default {red} draft c_C |
819 |/ |
814 |/ |
820 | * 15 default {red} draft c_C |
815 | o 15 default {red} draft c_C |
821 |/ |
816 |/ |
822 x 1 default {red} draft c_B |
817 x 1 default {red} draft c_B |
823 | |
818 | |
824 | o 14 default {red} draft c_B |
819 | o 14 default {red} draft c_B |
825 |/ |
820 |/ |
919 |/ |
913 |/ |
920 x b24bab30ac12 (20) c_G |
914 x b24bab30ac12 (20) c_G |
921 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
915 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
922 | |
916 | |
923 x 907f7d3c2333 (18) c_G |
917 x 907f7d3c2333 (18) c_G |
924 | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
918 | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
925 | |
919 | |
926 x 3ab2eedae500 (13) c_G |
920 x 3ab2eedae500 (13) c_G |
927 | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
921 | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
928 | |
922 | |
929 x c7d60a180d05 (6) c_G |
923 x c7d60a180d05 (6) c_G |
930 rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
924 rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
931 |
925 |
932 $ hg export . |
926 $ hg export . |
933 # HG changeset patch |
927 # HG changeset patch |
934 # User test3 |
928 # User test3 |
935 # Date 0 0 |
929 # Date 0 0 |