260 Case with some of the topic unstable |
260 Case with some of the topic unstable |
261 ------------------------------------ |
261 ------------------------------------ |
262 |
262 |
263 $ echo bbb > ddd |
263 $ echo bbb > ddd |
264 $ hg commit --amend |
264 $ hg commit --amend |
265 2 new orphan changesets |
|
266 $ hg log -G |
265 $ hg log -G |
267 @ 6 default {foo} draft c_d |
266 @ 6 default {foo} draft c_d |
268 | |
267 | |
269 | * 5 default {foo} draft c_f |
268 | o 5 default {foo} draft c_f |
270 | | |
269 | | |
271 | * 4 default {foo} draft c_e |
270 | o 4 default {foo} draft c_e |
272 | | |
271 | | |
273 | x 3 default {foo} draft c_d |
272 | x 3 default {foo} draft c_d |
274 |/ |
273 |/ |
275 o 2 default {foo} draft c_c |
274 o 2 default {foo} draft c_c |
276 | |
275 | |
395 |
394 |
396 $ hg up 'desc(c_d)' |
395 $ hg up 'desc(c_d)' |
397 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
396 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
398 $ echo ccc > ddd |
397 $ echo ccc > ddd |
399 $ hg commit --amend -m 'c_D' |
398 $ hg commit --amend -m 'c_D' |
400 4 new orphan changesets |
|
401 $ hg rebase -d . -s 'desc(c_g)' |
399 $ hg rebase -d . -s 'desc(c_g)' |
402 rebasing 9:81264ae8a36a "c_g" (foo) |
400 rebasing 9:81264ae8a36a "c_g" (foo) |
403 rebasing 10:fde5f5941642 "c_h" (foo) |
401 rebasing 10:fde5f5941642 "c_h" (foo) |
404 $ hg log -G |
402 $ hg log -G |
405 o 13 default {foo} draft c_h |
403 o 13 default {foo} draft c_h |
406 | |
404 | |
407 o 12 default {foo} draft c_g |
405 o 12 default {foo} draft c_g |
408 | |
406 | |
409 @ 11 default {foo} draft c_D |
407 @ 11 default {foo} draft c_D |
410 | |
408 | |
411 | * 8 default {foo} draft c_f |
409 | o 8 default {foo} draft c_f |
412 | | |
410 | | |
413 | * 7 default {foo} draft c_e |
411 | o 7 default {foo} draft c_e |
414 | | |
412 | | |
415 | x 6 default {foo} draft c_d |
413 | x 6 default {foo} draft c_d |
416 |/ |
414 |/ |
417 o 2 default {foo} draft c_c |
415 o 2 default {foo} draft c_c |
418 | |
416 | |
449 | |
447 | |
450 o 12 default {foo} draft c_g |
448 o 12 default {foo} draft c_g |
451 | |
449 | |
452 @ 11 default {foo} draft c_D |
450 @ 11 default {foo} draft c_D |
453 | |
451 | |
454 | * 8 default {foo} draft c_f |
452 | o 8 default {foo} draft c_f |
455 | | |
453 | | |
456 | * 7 default {foo} draft c_e |
454 | o 7 default {foo} draft c_e |
457 | | |
455 | | |
458 | x 6 default {foo} draft c_d |
456 | x 6 default {foo} draft c_d |
459 |/ |
457 |/ |
460 o 2 default {foo} draft c_c |
458 o 2 default {foo} draft c_c |
461 | |
459 | |
486 o 0 default {} public c_a |
484 o 0 default {} public c_a |
487 |
485 |
488 Changing topics on some commits in between |
486 Changing topics on some commits in between |
489 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
487 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
490 switching to topic foobar |
488 switching to topic foobar |
491 4 new orphan changesets |
|
492 changed topic on 2 changes |
489 changed topic on 2 changes |
493 $ hg log -G |
490 $ hg log -G |
494 @ 17 default {foobar} draft c_D |
491 @ 17 default {foobar} draft c_D |
495 | |
492 | |
496 | * 16 default {foobar} draft c_e |
493 | o 16 default {foobar} draft c_e |
497 | | |
494 | | |
498 | | * 15 default {foo} draft c_f |
495 | | o 15 default {foo} draft c_f |
499 | | | |
496 | | | |
500 | | x 14 default {foo} draft c_e |
497 | | x 14 default {foo} draft c_e |
501 | |/ |
498 | |/ |
502 | * 13 default {foo} draft c_h |
499 | o 13 default {foo} draft c_h |
503 | | |
500 | | |
504 | * 12 default {foo} draft c_g |
501 | o 12 default {foo} draft c_g |
505 | | |
502 | | |
506 | x 11 default {foo} draft c_D |
503 | x 11 default {foo} draft c_D |
507 |/ |
504 |/ |
508 o 2 default {foo} draft c_c |
505 o 2 default {foo} draft c_c |
509 | |
506 | |
512 o 0 default {} public c_a |
509 o 0 default {} public c_a |
513 |
510 |
514 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
511 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
515 rebasing 15:77082e55de88 "c_f" (foo) |
512 rebasing 15:77082e55de88 "c_f" (foo) |
516 switching to topic foo |
513 switching to topic foo |
517 1 new orphan changesets |
|
518 switching to topic foobar |
514 switching to topic foobar |
519 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
515 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
520 rebasing 12:0c3e8aed985d "c_g" (foo) |
516 rebasing 12:0c3e8aed985d "c_g" (foo) |
521 switching to topic foo |
517 switching to topic foo |
522 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
518 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
664 |
660 |
665 $ hg up 'desc("c_B")' |
661 $ hg up 'desc("c_B")' |
666 switching to topic red |
662 switching to topic red |
667 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
663 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
668 $ hg commit --amend --user test2 |
664 $ hg commit --amend --user test2 |
669 7 new orphan changesets |
|
670 $ hg up 'desc("c_C")' |
665 $ hg up 'desc("c_C")' |
671 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
672 $ hg commit --amend --user test2 |
667 $ hg commit --amend --user test2 |
673 $ hg up 'desc("c_D")' |
668 $ hg up 'desc("c_D")' |
674 switching to topic blue |
669 switching to topic blue |
676 $ hg commit --amend --user test2 |
671 $ hg commit --amend --user test2 |
677 |
672 |
678 $ hg log -G --rev 'sort(all(), "topo")' |
673 $ hg log -G --rev 'sort(all(), "topo")' |
679 @ 11 default {blue} draft c_D |
674 @ 11 default {blue} draft c_D |
680 | |
675 | |
681 | * 8 default {blue} draft c_I |
676 | o 8 default {blue} draft c_I |
682 | | |
677 | | |
683 | * 7 default {red} draft c_H |
678 | o 7 default {red} draft c_H |
684 | |\ |
679 | |\ |
685 | | * 6 default {blue} draft c_G |
680 | | o 6 default {blue} draft c_G |
686 | | | |
681 | | | |
687 | | * 5 default {red} draft c_F |
682 | | o 5 default {red} draft c_F |
688 | | | |
683 | | | |
689 | | * 4 default {red} draft c_E |
684 | | o 4 default {red} draft c_E |
690 | | | |
685 | | | |
691 | x | 3 default {blue} draft c_D |
686 | x | 3 default {blue} draft c_D |
692 |/ / |
687 |/ / |
693 x / 2 default {red} draft c_C |
688 x / 2 default {red} draft c_C |
694 |/ |
689 |/ |
695 | * 10 default {red} draft c_C |
690 | o 10 default {red} draft c_C |
696 |/ |
691 |/ |
697 x 1 default {red} draft c_B |
692 x 1 default {red} draft c_B |
698 | |
693 | |
699 | o 9 default {red} draft c_B |
694 | o 9 default {red} draft c_B |
700 |/ |
695 |/ |
746 $ hg commit --amend --user test3 |
741 $ hg commit --amend --user test3 |
747 |
742 |
748 $ hg log -G --rev 'sort(all(), "topo")' |
743 $ hg log -G --rev 'sort(all(), "topo")' |
749 @ 16 default {blue} draft c_D |
744 @ 16 default {blue} draft c_D |
750 | |
745 | |
751 | * 13 default {blue} draft c_G |
746 | o 13 default {blue} draft c_G |
752 | | |
747 | | |
753 | | * 12 default {red} draft c_H |
748 | | o 12 default {red} draft c_H |
754 | | |\ |
749 | | |\ |
755 | | | | * 8 default {blue} draft c_I |
750 | | | | o 8 default {blue} draft c_I |
756 | | | | | |
751 | | | | | |
757 | | +---x 7 default {red} draft c_H |
752 | | +---x 7 default {red} draft c_H |
758 | | | |/ |
753 | | | |/ |
759 | +---x 6 default {blue} draft c_G |
754 | +---x 6 default {blue} draft c_G |
760 | | | |
755 | | | |
761 | * | 5 default {red} draft c_F |
756 | o | 5 default {red} draft c_F |
762 | | | |
757 | | | |
763 | * | 4 default {red} draft c_E |
758 | o | 4 default {red} draft c_E |
764 | | | |
759 | | | |
765 +---x 3 default {blue} draft c_D |
760 +---x 3 default {blue} draft c_D |
766 | | |
761 | | |
767 x | 2 default {red} draft c_C |
762 x | 2 default {red} draft c_C |
768 |/ |
763 |/ |
769 | * 15 default {red} draft c_C |
764 | o 15 default {red} draft c_C |
770 |/ |
765 |/ |
771 x 1 default {red} draft c_B |
766 x 1 default {red} draft c_B |
772 | |
767 | |
773 | o 14 default {red} draft c_B |
768 | o 14 default {red} draft c_B |
774 |/ |
769 |/ |
868 |/ |
862 |/ |
869 x b24bab30ac12 (20) c_G |
863 x b24bab30ac12 (20) c_G |
870 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
864 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
871 | |
865 | |
872 x 907f7d3c2333 (18) c_G |
866 x 907f7d3c2333 (18) c_G |
873 | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
867 | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
874 | |
868 | |
875 x 3ab2eedae500 (13) c_G |
869 x 3ab2eedae500 (13) c_G |
876 | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
870 | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
877 | |
871 | |
878 x c7d60a180d05 (6) c_G |
872 x c7d60a180d05 (6) c_G |
879 rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
873 rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
880 |
874 |
881 $ hg export . |
875 $ hg export . |
882 # HG changeset patch |
876 # HG changeset patch |
883 # User test3 |
877 # User test3 |
884 # Date 0 0 |
878 # Date 0 0 |