Mercurial > evolve

comparison tests/test-topic-stack.t @ 2918:0437158e0ed6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stack: display both parent with displaying merge This will help understanding merge in the stack. More test involving merge are adding in the next changeset.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 07 Sep 2017 19:43:07 +0200
parents 044686b25cf7
children 5b514ab2ab4e
comparison
equal deleted inserted replaced
2917:044686b25cf7 2918:0437158e0ed6
625 t4: c_F 625 t4: c_F
626 t3: c_E 626 t3: c_E
627 t2: c_B 627 t2: c_B
628 ^ c_A 628 ^ c_A
629 t1: c_H 629 t1: c_H
630 ^ c_G
631 ^ c_D
630 t0^ c_D (base) 632 t0^ c_D (base)
631 $ hg stack blue 633 $ hg stack blue
632 ### topic: blue (3 heads) 634 ### topic: blue (3 heads)
633 ### branch: default, ambigious rebase destination 635 ### branch: default, ambigious rebase destination
634 t3: c_D 636 t3: c_D
683 685
684 $ hg stack red 686 $ hg stack red
685 ### topic: red (3 heads) 687 ### topic: red (3 heads)
686 ### branch: default, ambigious rebase destination 688 ### branch: default, ambigious rebase destination
687 t5$ c_H (unstable) 689 t5$ c_H (unstable)
690 ^ c_G
688 ^ c_D 691 ^ c_D
689 t4$ c_C (unstable) 692 t4$ c_C (unstable)
690 t1^ c_B (base) 693 t1^ c_B (base)
691 t3$ c_F (unstable) 694 t3$ c_F (unstable)
692 t2$ c_E (unstable) 695 t2$ c_E (unstable)
756 759
757 $ hg stack red 760 $ hg stack red
758 ### topic: red (3 heads) 761 ### topic: red (3 heads)
759 ### branch: default, ambigious rebase destination 762 ### branch: default, ambigious rebase destination
760 t5$ c_H (unstable) 763 t5$ c_H (unstable)
764 ^ c_G
761 ^ c_D 765 ^ c_D
762 t4$ c_F (unstable) 766 t4$ c_F (unstable)
763 t3$ c_E (unstable) 767 t3$ c_E (unstable)
764 t1^ c_B (base) 768 t1^ c_B (base)
765 t2$ c_C (unstable) 769 t2$ c_C (unstable)