comparison tests/test-topic.t @ 2712:f19b314d8475

topics: add t0 and b0 to the stack t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on t1, you will be updated to t0 with the current topic preserved. This patch adds t0 to stack and implement the preserving topic case for t0 while using `hg update`.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 04 Jul 2017 01:30:14 +0530
parents 9b68a2083dac
children ed45a5fb4452
comparison
equal deleted inserted replaced
2711:8c938e9af113 2712:f19b314d8475
775 | parent: 3:a53952faf762 775 | parent: 3:a53952faf762
776 | user: test 776 | user: test
777 | date: Thu Jan 01 00:00:00 1970 +0000 777 | date: Thu Jan 01 00:00:00 1970 +0000
778 | summary: start on fran 778 | summary: start on fran
779 | 779 |
780
781 Testing for updating to t0
782 ==========================
783
784 $ hg stack
785 ### topic: changewut (2 heads)
786 ### branch: default, 5 behind
787 t3: fran?
788 t1^ start on fran (base)
789 t2@ gamma (current)
790 t1: start on fran
791 t0^ Add file delta (base)
792 $ hg up t0
793 preserving the current topic 'changewut'
794 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
795 $ hg topic
796 * changewut
797 $ hg stack
798 ### topic: changewut (2 heads)
799 ### branch: default, 5 behind
800 t3: fran?
801 t1^ start on fran (base)
802 t2: gamma
803 t1: start on fran
804 t0^ Add file delta (base)