Mercurial > evolve
comparison tests/test-topic-rebase.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 | d22090c6e68f |
| children | 4dd84054ebbb |
comparison
equal
deleted
inserted
replaced
| 2711:8c938e9af113 | 2712:f19b314d8475 |
|---|---|
| 44 $ mkcommit feature1 | 44 $ mkcommit feature1 |
| 45 $ hg stack | 45 $ hg stack |
| 46 ### topic: myfeature | 46 ### topic: myfeature |
| 47 ### branch: default | 47 ### branch: default |
| 48 t1@ add feature1 (current) | 48 t1@ add feature1 (current) |
| 49 ^ add ROOT | 49 t0^ add ROOT (base) |
| 50 $ logtopic | 50 $ logtopic |
| 51 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 | 51 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 |
| 52 | topics: myfeature | 52 | topics: myfeature |
| 53 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 | 53 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 |
| 54 topics: | 54 topics: |
| 74 switching to topic myfeature | 74 switching to topic myfeature |
| 75 $ hg stack | 75 $ hg stack |
| 76 ### topic: myfeature | 76 ### topic: myfeature |
| 77 ### branch: default | 77 ### branch: default |
| 78 t1@ add feature1 (current) | 78 t1@ add feature1 (current) |
| 79 ^ add default | 79 t0^ add default (base) |
| 80 $ logtopic | 80 $ logtopic |
| 81 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 | 81 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 |
| 82 | topics: myfeature | 82 | topics: myfeature |
| 83 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef | 83 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef |
| 84 | topics: | 84 | topics: |
| 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 89 $ hg stack | 89 $ hg stack |
| 90 ### topic: myfeature | 90 ### topic: myfeature |
| 91 ### branch: default | 91 ### branch: default |
| 92 t1@ add feature1 (current) | 92 t1@ add feature1 (current) |
| 93 ^ add default | 93 t0^ add default (base) |
| 94 | 94 |
| 95 Check that rebase keep the topic in case of merge conflict | 95 Check that rebase keep the topic in case of merge conflict |
| 96 ---------------------------------------------------------- | 96 ---------------------------------------------------------- |
| 97 | 97 |
| 98 Create a common base | 98 Create a common base |
| 150 topics: | 150 topics: |
| 151 $ hg stack | 151 $ hg stack |
| 152 ### topic: myotherfeature | 152 ### topic: myotherfeature |
| 153 ### branch: default | 153 ### branch: default |
| 154 t1@ myotherfeature1 (current) | 154 t1@ myotherfeature1 (current) |
| 155 ^ default3 | 155 t0^ default3 (base) |
| 156 $ hg update --rev 7 | 156 $ hg update --rev 7 |
| 157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 157 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 158 $ hg stack | 158 $ hg stack |
| 159 ### topic: myotherfeature | 159 ### topic: myotherfeature |
| 160 ### branch: default | 160 ### branch: default |
| 161 t1@ myotherfeature1 (current) | 161 t1@ myotherfeature1 (current) |
| 162 ^ default3 | 162 t0^ default3 (base) |