Mercurial > evolve
comparison tests/test-evolve-topic.t @ 1627:a91115687a7e
topic: preserve topic during evolve
previously, topic handling was absent leading to whatever the active topic was
when `hg evolve` was run to be used for all evolve results
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 17 Mar 2016 10:04:30 -0700 |
parents | 0edb545503fe |
children | db19b1dc5c45 |
comparison
equal
deleted
inserted
replaced
1626:0edb545503fe | 1627:a91115687a7e |
---|---|
155 o 1 - {} a4dbed0837ea add bbb (draft) | 155 o 1 - {} a4dbed0837ea add bbb (draft) |
156 | | 156 | |
157 o 0 - {} 199cc73e9a0b add aaa (draft) | 157 o 0 - {} 199cc73e9a0b add aaa (draft) |
158 | 158 |
159 | 159 |
160 Test that evolve does not loose topic information | |
161 ------------------------------------------------- | |
162 | |
163 $ hg evolve --rev 'topic(bar)' | |
164 move:[6] add ggg | |
165 atop:[15] add fff | |
166 move:[7] add hhh | |
167 atop:[16] add ggg | |
168 move:[8] add iii | |
169 atop:[17] add hhh | |
170 move:[9] add jjj | |
171 atop:[18] add iii | |
172 working directory is now at 9bf430c106b7 | |
173 $ hg log -G | |
174 @ 19 - {bar} 9bf430c106b7 add jjj (draft) | |
175 | | |
176 o 18 - {bar} d2dc89c57700 add iii (draft) | |
177 | | |
178 o 17 - {bar} 20bc4d02aa62 add hhh (draft) | |
179 | | |
180 o 16 - {bar} 16d6f664b17c add ggg (draft) | |
181 | | |
182 o 15 - {foo} 070c5573d8f9 add fff (draft) | |
183 | | |
184 o 14 - {foo} 42b49017ff90 add eee (draft) | |
185 | | |
186 o 11 - {foo} d9cacd156ffc add ddd (draft) | |
187 | | |
188 o 2 - {foo} cced9bac76e3 add ccc (draft) | |
189 | | |
190 o 1 - {} a4dbed0837ea add bbb (draft) | |
191 | | |
192 o 0 - {} 199cc73e9a0b add aaa (draft) | |
193 |