321 Case with some of the topic unstable |
321 Case with some of the topic unstable |
322 ------------------------------------ |
322 ------------------------------------ |
323 |
323 |
324 $ echo bbb > ddd |
324 $ echo bbb > ddd |
325 $ hg commit --amend |
325 $ hg commit --amend |
326 2 new orphan changesets |
|
327 $ hg log -G |
326 $ hg log -G |
328 @ 6 default {foo} draft c_d |
327 @ 6 default {foo} draft c_d |
329 | |
328 | |
330 | * 5 default {foo} draft c_f |
329 | o 5 default {foo} draft c_f |
331 | | |
330 | | |
332 | * 4 default {foo} draft c_e |
331 | o 4 default {foo} draft c_e |
333 | | |
332 | | |
334 | x 3 default {foo} draft c_d |
333 | x 3 default {foo} draft c_d |
335 |/ |
334 |/ |
336 o 2 default {foo} draft c_c |
335 o 2 default {foo} draft c_c |
337 | |
336 | |
456 |
455 |
457 $ hg up 'desc(c_d)' |
456 $ hg up 'desc(c_d)' |
458 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
457 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
459 $ echo ccc > ddd |
458 $ echo ccc > ddd |
460 $ hg commit --amend -m 'c_D' |
459 $ hg commit --amend -m 'c_D' |
461 4 new orphan changesets |
|
462 $ hg rebase -d . -s 'desc(c_g)' |
460 $ hg rebase -d . -s 'desc(c_g)' |
463 rebasing 9:81264ae8a36a "c_g" (foo) |
461 rebasing 9:81264ae8a36a "c_g" (foo) |
464 rebasing 10:fde5f5941642 "c_h" (foo) |
462 rebasing 10:fde5f5941642 "c_h" (foo) |
465 $ hg log -G |
463 $ hg log -G |
466 o 13 default {foo} draft c_h |
464 o 13 default {foo} draft c_h |
467 | |
465 | |
468 o 12 default {foo} draft c_g |
466 o 12 default {foo} draft c_g |
469 | |
467 | |
470 @ 11 default {foo} draft c_D |
468 @ 11 default {foo} draft c_D |
471 | |
469 | |
472 | * 8 default {foo} draft c_f |
470 | o 8 default {foo} draft c_f |
473 | | |
471 | | |
474 | * 7 default {foo} draft c_e |
472 | o 7 default {foo} draft c_e |
475 | | |
473 | | |
476 | x 6 default {foo} draft c_d |
474 | x 6 default {foo} draft c_d |
477 |/ |
475 |/ |
478 o 2 default {foo} draft c_c |
476 o 2 default {foo} draft c_c |
479 | |
477 | |
510 | |
508 | |
511 o 12 default {foo} draft c_g |
509 o 12 default {foo} draft c_g |
512 | |
510 | |
513 @ 11 default {foo} draft c_D |
511 @ 11 default {foo} draft c_D |
514 | |
512 | |
515 | * 8 default {foo} draft c_f |
513 | o 8 default {foo} draft c_f |
516 | | |
514 | | |
517 | * 7 default {foo} draft c_e |
515 | o 7 default {foo} draft c_e |
518 | | |
516 | | |
519 | x 6 default {foo} draft c_d |
517 | x 6 default {foo} draft c_d |
520 |/ |
518 |/ |
521 o 2 default {foo} draft c_c |
519 o 2 default {foo} draft c_c |
522 | |
520 | |
547 o 0 default {} public c_a |
545 o 0 default {} public c_a |
548 |
546 |
549 Changing topics on some commits in between |
547 Changing topics on some commits in between |
550 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
548 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
551 switching to topic foobar |
549 switching to topic foobar |
552 4 new orphan changesets |
|
553 changed topic on 2 changesets to "foobar" |
550 changed topic on 2 changesets to "foobar" |
554 $ hg log -G |
551 $ hg log -G |
555 @ 17 default {foobar} draft c_D |
552 @ 17 default {foobar} draft c_D |
556 | |
553 | |
557 | * 16 default {foobar} draft c_e |
554 | o 16 default {foobar} draft c_e |
558 | | |
555 | | |
559 | | * 15 default {foo} draft c_f |
556 | | o 15 default {foo} draft c_f |
560 | | | |
557 | | | |
561 | | x 14 default {foo} draft c_e |
558 | | x 14 default {foo} draft c_e |
562 | |/ |
559 | |/ |
563 | * 13 default {foo} draft c_h |
560 | o 13 default {foo} draft c_h |
564 | | |
561 | | |
565 | * 12 default {foo} draft c_g |
562 | o 12 default {foo} draft c_g |
566 | | |
563 | | |
567 | x 11 default {foo} draft c_D |
564 | x 11 default {foo} draft c_D |
568 |/ |
565 |/ |
569 o 2 default {foo} draft c_c |
566 o 2 default {foo} draft c_c |
570 | |
567 | |
573 o 0 default {} public c_a |
570 o 0 default {} public c_a |
574 |
571 |
575 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
572 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
576 rebasing 15:77082e55de88 "c_f" (foo) |
573 rebasing 15:77082e55de88 "c_f" (foo) |
577 switching to topic foo |
574 switching to topic foo |
578 1 new orphan changesets |
|
579 switching to topic foobar |
575 switching to topic foobar |
580 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
576 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
581 rebasing 12:0c3e8aed985d "c_g" (foo) |
577 rebasing 12:0c3e8aed985d "c_g" (foo) |
582 switching to topic foo |
578 switching to topic foo |
583 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
579 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
743 |
739 |
744 $ hg up 'desc("c_B")' |
740 $ hg up 'desc("c_B")' |
745 switching to topic red |
741 switching to topic red |
746 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
742 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
747 $ hg commit --amend --user test2 |
743 $ hg commit --amend --user test2 |
748 7 new orphan changesets |
|
749 $ hg up 'desc("c_C")' |
744 $ hg up 'desc("c_C")' |
750 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
745 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
751 $ hg commit --amend --user test2 |
746 $ hg commit --amend --user test2 |
752 $ hg up 'desc("c_D")' |
747 $ hg up 'desc("c_D")' |
753 switching to topic blue |
748 switching to topic blue |
755 $ hg commit --amend --user test2 |
750 $ hg commit --amend --user test2 |
756 |
751 |
757 $ hg log -G --rev 'sort(all(), "topo")' |
752 $ hg log -G --rev 'sort(all(), "topo")' |
758 @ 11 default {blue} draft c_D |
753 @ 11 default {blue} draft c_D |
759 | |
754 | |
760 | * 8 default {blue} draft c_I |
755 | o 8 default {blue} draft c_I |
761 | | |
756 | | |
762 | * 7 default {red} draft c_H |
757 | o 7 default {red} draft c_H |
763 | |\ |
758 | |\ |
764 | | * 6 default {blue} draft c_G |
759 | | o 6 default {blue} draft c_G |
765 | | | |
760 | | | |
766 | | * 5 default {red} draft c_F |
761 | | o 5 default {red} draft c_F |
767 | | | |
762 | | | |
768 | | * 4 default {red} draft c_E |
763 | | o 4 default {red} draft c_E |
769 | | | |
764 | | | |
770 | x | 3 default {blue} draft c_D |
765 | x | 3 default {blue} draft c_D |
771 |/ / |
766 |/ / |
772 x / 2 default {red} draft c_C |
767 x / 2 default {red} draft c_C |
773 |/ |
768 |/ |
774 | * 10 default {red} draft c_C |
769 | o 10 default {red} draft c_C |
775 |/ |
770 |/ |
776 x 1 default {red} draft c_B |
771 x 1 default {red} draft c_B |
777 | |
772 | |
778 | o 9 default {red} draft c_B |
773 | o 9 default {red} draft c_B |
779 |/ |
774 |/ |
825 $ hg commit --amend --user test3 |
820 $ hg commit --amend --user test3 |
826 |
821 |
827 $ hg log -G --rev 'sort(all(), "topo")' |
822 $ hg log -G --rev 'sort(all(), "topo")' |
828 @ 16 default {blue} draft c_D |
823 @ 16 default {blue} draft c_D |
829 | |
824 | |
830 | * 13 default {blue} draft c_G |
825 | o 13 default {blue} draft c_G |
831 | | |
826 | | |
832 | | * 12 default {red} draft c_H |
827 | | o 12 default {red} draft c_H |
833 | | |\ |
828 | | |\ |
834 | | | | * 8 default {blue} draft c_I |
829 | | | | o 8 default {blue} draft c_I |
835 | | | | | |
830 | | | | | |
836 | | +---x 7 default {red} draft c_H |
831 | | +---x 7 default {red} draft c_H |
837 | | | |/ |
832 | | | |/ |
838 | +---x 6 default {blue} draft c_G |
833 | +---x 6 default {blue} draft c_G |
839 | | | |
834 | | | |
840 | * | 5 default {red} draft c_F |
835 | o | 5 default {red} draft c_F |
841 | | | |
836 | | | |
842 | * | 4 default {red} draft c_E |
837 | o | 4 default {red} draft c_E |
843 | | | |
838 | | | |
844 +---x 3 default {blue} draft c_D |
839 +---x 3 default {blue} draft c_D |
845 | | |
840 | | |
846 x | 2 default {red} draft c_C |
841 x | 2 default {red} draft c_C |
847 |/ |
842 |/ |
848 | * 15 default {red} draft c_C |
843 | o 15 default {red} draft c_C |
849 |/ |
844 |/ |
850 x 1 default {red} draft c_B |
845 x 1 default {red} draft c_B |
851 | |
846 | |
852 | o 14 default {red} draft c_B |
847 | o 14 default {red} draft c_B |
853 |/ |
848 |/ |
947 |/ |
941 |/ |
948 x b24bab30ac12 (20) c_G |
942 x b24bab30ac12 (20) c_G |
949 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
943 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
950 | |
944 | |
951 x 907f7d3c2333 (18) c_G |
945 x 907f7d3c2333 (18) c_G |
952 | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
946 | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
953 | |
947 | |
954 x 3ab2eedae500 (13) c_G |
948 x 3ab2eedae500 (13) c_G |
955 | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
949 | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
956 | |
950 | |
957 x c7d60a180d05 (6) c_G |
951 x c7d60a180d05 (6) c_G |
958 rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
952 rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
959 |
953 |
960 $ hg export . |
954 $ hg export . |
961 # HG changeset patch |
955 # HG changeset patch |
962 # User test3 |
956 # User test3 |
963 # Date 0 0 |
957 # Date 0 0 |