Mercurial > evolve

comparison tests/test-topic-stack.t @ 3935:9af0e2b0bdd7 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:47 +0200
parents d00f0c369bc7
children 537fd9a86c06 f9a850018daa
comparison
equal deleted inserted replaced
3934:d55a6fef9eb9 3935:9af0e2b0bdd7
262 Case with some of the topic unstable 262 Case with some of the topic unstable
263 ------------------------------------ 263 ------------------------------------
264 264
265 $ echo bbb > ddd 265 $ echo bbb > ddd
266 $ hg commit --amend 266 $ hg commit --amend
267 2 new orphan changesets
268 $ hg log -G 267 $ hg log -G
269 @ 6 default {foo} draft c_d 268 @ 6 default {foo} draft c_d
270 | 269 |
271 | * 5 default {foo} draft c_f 270 | o 5 default {foo} draft c_f
272 | | 271 | |
273 | * 4 default {foo} draft c_e 272 | o 4 default {foo} draft c_e
274 | | 273 | |
275 | x 3 default {foo} draft c_d 274 | x 3 default {foo} draft c_d
276 |/ 275 |/
277 o 2 default {foo} draft c_c 276 o 2 default {foo} draft c_c
278 | 277 |
397 396
398 $ hg up 'desc(c_d)' 397 $ hg up 'desc(c_d)'
399 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 398 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
400 $ echo ccc > ddd 399 $ echo ccc > ddd
401 $ hg commit --amend -m 'c_D' 400 $ hg commit --amend -m 'c_D'
402 4 new orphan changesets
403 $ hg rebase -d . -s 'desc(c_g)' 401 $ hg rebase -d . -s 'desc(c_g)'
404 rebasing 9:81264ae8a36a "c_g" (foo) 402 rebasing 9:81264ae8a36a "c_g" (foo)
405 rebasing 10:fde5f5941642 "c_h" (foo) 403 rebasing 10:fde5f5941642 "c_h" (foo)
406 $ hg log -G 404 $ hg log -G
407 o 13 default {foo} draft c_h 405 o 13 default {foo} draft c_h
408 | 406 |
409 o 12 default {foo} draft c_g 407 o 12 default {foo} draft c_g
410 | 408 |
411 @ 11 default {foo} draft c_D 409 @ 11 default {foo} draft c_D
412 | 410 |
413 | * 8 default {foo} draft c_f 411 | o 8 default {foo} draft c_f
414 | | 412 | |
415 | * 7 default {foo} draft c_e 413 | o 7 default {foo} draft c_e
416 | | 414 | |
417 | x 6 default {foo} draft c_d 415 | x 6 default {foo} draft c_d
418 |/ 416 |/
419 o 2 default {foo} draft c_c 417 o 2 default {foo} draft c_c
420 | 418 |
451 | 449 |
452 o 12 default {foo} draft c_g 450 o 12 default {foo} draft c_g
453 | 451 |
454 @ 11 default {foo} draft c_D 452 @ 11 default {foo} draft c_D
455 | 453 |
456 | * 8 default {foo} draft c_f 454 | o 8 default {foo} draft c_f
457 | | 455 | |
458 | * 7 default {foo} draft c_e 456 | o 7 default {foo} draft c_e
459 | | 457 | |
460 | x 6 default {foo} draft c_d 458 | x 6 default {foo} draft c_d
461 |/ 459 |/
462 o 2 default {foo} draft c_c 460 o 2 default {foo} draft c_c
463 | 461 |
488 o 0 default {} public c_a 486 o 0 default {} public c_a
489 487
490 Changing topics on some commits in between 488 Changing topics on some commits in between
491 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' 489 $ hg topic foobar -r 'desc(c_e) + desc(c_D)'
492 switching to topic foobar 490 switching to topic foobar
493 4 new orphan changesets
494 changed topic on 2 changes 491 changed topic on 2 changes
495 $ hg log -G 492 $ hg log -G
496 @ 17 default {foobar} draft c_D 493 @ 17 default {foobar} draft c_D
497 | 494 |
498 | * 16 default {foobar} draft c_e 495 | o 16 default {foobar} draft c_e
499 | | 496 | |
500 | | * 15 default {foo} draft c_f 497 | | o 15 default {foo} draft c_f
501 | | | 498 | | |
502 | | x 14 default {foo} draft c_e 499 | | x 14 default {foo} draft c_e
503 | |/ 500 | |/
504 | * 13 default {foo} draft c_h 501 | o 13 default {foo} draft c_h
505 | | 502 | |
506 | * 12 default {foo} draft c_g 503 | o 12 default {foo} draft c_g
507 | | 504 | |
508 | x 11 default {foo} draft c_D 505 | x 11 default {foo} draft c_D
509 |/ 506 |/
510 o 2 default {foo} draft c_c 507 o 2 default {foo} draft c_c
511 | 508 |
514 o 0 default {} public c_a 511 o 0 default {} public c_a
515 512
516 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' 513 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
517 rebasing 15:77082e55de88 "c_f" (foo) 514 rebasing 15:77082e55de88 "c_f" (foo)
518 switching to topic foo 515 switching to topic foo
519 1 new orphan changesets
520 switching to topic foobar 516 switching to topic foobar
521 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' 517 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
522 rebasing 12:0c3e8aed985d "c_g" (foo) 518 rebasing 12:0c3e8aed985d "c_g" (foo)
523 switching to topic foo 519 switching to topic foo
524 rebasing 13:b9e4f3709bc5 "c_h" (foo) 520 rebasing 13:b9e4f3709bc5 "c_h" (foo)
668 664
669 $ hg up 'desc("c_B")' 665 $ hg up 'desc("c_B")'
670 switching to topic red 666 switching to topic red
671 0 files updated, 0 files merged, 6 files removed, 0 files unresolved 667 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
672 $ hg commit --amend --user test2 668 $ hg commit --amend --user test2
673 7 new orphan changesets
674 $ hg up 'desc("c_C")' 669 $ hg up 'desc("c_C")'
675 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 670 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
676 $ hg commit --amend --user test2 671 $ hg commit --amend --user test2
677 $ hg up 'desc("c_D")' 672 $ hg up 'desc("c_D")'
678 switching to topic blue 673 switching to topic blue
680 $ hg commit --amend --user test2 675 $ hg commit --amend --user test2
681 676
682 $ hg log -G --rev 'sort(all(), "topo")' 677 $ hg log -G --rev 'sort(all(), "topo")'
683 @ 11 default {blue} draft c_D 678 @ 11 default {blue} draft c_D
684 | 679 |
685 | * 8 default {blue} draft c_I 680 | o 8 default {blue} draft c_I
686 | | 681 | |
687 | * 7 default {red} draft c_H 682 | o 7 default {red} draft c_H
688 | |\ 683 | |\
689 | | * 6 default {blue} draft c_G 684 | | o 6 default {blue} draft c_G
690 | | | 685 | | |
691 | | * 5 default {red} draft c_F 686 | | o 5 default {red} draft c_F
692 | | | 687 | | |
693 | | * 4 default {red} draft c_E 688 | | o 4 default {red} draft c_E
694 | | | 689 | | |
695 | x | 3 default {blue} draft c_D 690 | x | 3 default {blue} draft c_D
696 |/ / 691 |/ /
697 x / 2 default {red} draft c_C 692 x / 2 default {red} draft c_C
698 |/ 693 |/
699 | * 10 default {red} draft c_C 694 | o 10 default {red} draft c_C
700 |/ 695 |/
701 x 1 default {red} draft c_B 696 x 1 default {red} draft c_B
702 | 697 |
703 | o 9 default {red} draft c_B 698 | o 9 default {red} draft c_B
704 |/ 699 |/
750 $ hg commit --amend --user test3 745 $ hg commit --amend --user test3
751 746
752 $ hg log -G --rev 'sort(all(), "topo")' 747 $ hg log -G --rev 'sort(all(), "topo")'
753 @ 16 default {blue} draft c_D 748 @ 16 default {blue} draft c_D
754 | 749 |
755 | * 13 default {blue} draft c_G 750 | o 13 default {blue} draft c_G
756 | | 751 | |
757 | | * 12 default {red} draft c_H 752 | | o 12 default {red} draft c_H
758 | | |\ 753 | | |\
759 | | | | * 8 default {blue} draft c_I 754 | | | | o 8 default {blue} draft c_I
760 | | | | | 755 | | | | |
761 | | +---x 7 default {red} draft c_H 756 | | +---x 7 default {red} draft c_H
762 | | | |/ 757 | | | |/
763 | +---x 6 default {blue} draft c_G 758 | +---x 6 default {blue} draft c_G
764 | | | 759 | | |
765 | * | 5 default {red} draft c_F 760 | o | 5 default {red} draft c_F
766 | | | 761 | | |
767 | * | 4 default {red} draft c_E 762 | o | 4 default {red} draft c_E
768 | | | 763 | | |
769 +---x 3 default {blue} draft c_D 764 +---x 3 default {blue} draft c_D
770 | | 765 | |
771 x | 2 default {red} draft c_C 766 x | 2 default {red} draft c_C
772 |/ 767 |/
773 | * 15 default {red} draft c_C 768 | o 15 default {red} draft c_C
774 |/ 769 |/
775 x 1 default {red} draft c_B 770 x 1 default {red} draft c_B
776 | 771 |
777 | o 14 default {red} draft c_B 772 | o 14 default {red} draft c_B
778 |/ 773 |/
829 $ hg status --change . 824 $ hg status --change .
830 A ggg 825 A ggg
831 $ echo zzz > Z 826 $ echo zzz > Z
832 $ hg add Z 827 $ hg add Z
833 $ hg commit --amend 828 $ hg commit --amend
834 1 new orphan changesets
835 $ hg status --change . 829 $ hg status --change .
836 A Z 830 A Z
837 A ggg 831 A ggg
838 $ hg stack 832 $ hg stack
839 ### topic: blue 833 ### topic: blue
872 |/ 866 |/
873 x b24bab30ac12 (20) c_G 867 x b24bab30ac12 (20) c_G
874 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) 868 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
875 | 869 |
876 x 907f7d3c2333 (18) c_G 870 x 907f7d3c2333 (18) c_G
877 | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 871 | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
878 | 872 |
879 x 3ab2eedae500 (13) c_G 873 x 3ab2eedae500 (13) c_G
880 | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 874 | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
881 | 875 |
882 x c7d60a180d05 (6) c_G 876 x c7d60a180d05 (6) c_G
883 rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 877 rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
884 878
885 $ hg export . 879 $ hg export .
886 # HG changeset patch 880 # HG changeset patch
887 # User test3 881 # User test3
888 # Date 0 0 882 # Date 0 0