Mercurial > evolve

comparison tests/test-topic-rebase.t @ 4076:f9a850018daa 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 Mon, 03 Sep 2018 22:06:12 +0200
parents fb4801478d5d
children 9c025ec4af88 0d65a5e96691
comparison
equal deleted inserted replaced
4032:fc065ec30351 4076:f9a850018daa
45 active topic 'myfeature' grew its first changeset 45 active topic 'myfeature' grew its first changeset
46 (see 'hg help topics' for more information) 46 (see 'hg help topics' for more information)
47 $ hg stack 47 $ hg stack
48 ### topic: myfeature 48 ### topic: myfeature
49 ### target: default (branch) 49 ### target: default (branch)
50 t1@ add feature1 (current) 50 s1@ add feature1 (current)
51 t0^ add ROOT (base) 51 s0^ add ROOT (base)
52 $ logtopic 52 $ logtopic
53 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 53 @ 1:39e7a938055e87615edf675c24a10997ff05bb06
54 | topics: myfeature 54 | topics: myfeature
55 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 55 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
56 topics: 56 topics:
75 rebasing 1:39e7a938055e "add feature1" (myfeature) 75 rebasing 1:39e7a938055e "add feature1" (myfeature)
76 switching to topic myfeature 76 switching to topic myfeature
77 $ hg stack 77 $ hg stack
78 ### topic: myfeature 78 ### topic: myfeature
79 ### target: default (branch) 79 ### target: default (branch)
80 t1@ add feature1 (current) 80 s1@ add feature1 (current)
81 t0^ add default (base) 81 s0^ add default (base)
82 $ logtopic 82 $ logtopic
83 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 83 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726
84 | topics: myfeature 84 | topics: myfeature
85 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef 85 o 2:be7622a7a0f43ba713e152f56441275f8e8711ef
86 | topics: 86 | topics:
89 $ hg up 3 89 $ hg up 3
90 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 90 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 $ hg stack 91 $ hg stack
92 ### topic: myfeature 92 ### topic: myfeature
93 ### target: default (branch) 93 ### target: default (branch)
94 t1@ add feature1 (current) 94 s1@ add feature1 (current)
95 t0^ add default (base) 95 s0^ add default (base)
96 96
97 Check that rebase keep the topic in case of merge conflict 97 Check that rebase keep the topic in case of merge conflict
98 ---------------------------------------------------------- 98 ----------------------------------------------------------
99 99
100 Create a common base 100 Create a common base
155 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 155 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7
156 topics: 156 topics:
157 $ hg stack 157 $ hg stack
158 ### topic: myotherfeature 158 ### topic: myotherfeature
159 ### target: default (branch) 159 ### target: default (branch)
160 t1@ myotherfeature1 (current) 160 s1@ myotherfeature1 (current)
161 t0^ default3 (base) 161 s0^ default3 (base)
162 $ hg update --rev 7 162 $ hg update --rev 7
163 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 163 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
164 $ hg stack 164 $ hg stack
165 ### topic: myotherfeature 165 ### topic: myotherfeature
166 ### target: default (branch) 166 ### target: default (branch)
167 t1@ myotherfeature1 (current) 167 s1@ myotherfeature1 (current)
168 t0^ default3 (base) 168 s0^ default3 (base)