equal
deleted
inserted
replaced
178 | |
178 | |
179 o 8:86a186070af2 {foo} |
179 o 8:86a186070af2 {foo} |
180 Added a () |
180 Added a () |
181 |
181 |
182 $ hg rebase -s 11 -d 22 |
182 $ hg rebase -s 11 -d 22 |
183 rebasing 11:1315a3808ed0 "Added d" (foo) |
183 rebasing 11:1315a3808ed0 "Added d" |
184 switching to topic foo |
184 switching to topic foo |
185 rebasing 16:edc4a6b9ea60 "Added e" (bar) |
185 rebasing 16:edc4a6b9ea60 "Added e" |
186 switching to topic bar |
186 switching to topic bar |
187 rebasing 17:82e0b14f4d9e "Added f" (bar) |
187 rebasing 17:82e0b14f4d9e "Added f" |
188 rebasing 18:e7b418d79a05 "Added g" (bar) |
188 rebasing 18:e7b418d79a05 "Added g" |
189 rebasing 20:c2d6b7df5dcf "Added h" (foobar) |
189 rebasing 20:c2d6b7df5dcf "Added h" |
190 switching to topic foobar |
190 switching to topic foobar |
191 |
191 |
192 $ hg glog |
192 $ hg glog |
193 @ 27:a1a9465da59b {foobar} |
193 @ 27:a1a9465da59b {foobar} |
194 | Added h () |
194 | Added h () |
221 |
221 |
222 $ hg topic wat |
222 $ hg topic wat |
223 $ hg ci --amend |
223 $ hg ci --amend |
224 active topic 'wat' grew its first changeset |
224 active topic 'wat' grew its first changeset |
225 $ hg glog -r . |
225 $ hg glog -r . |
226 @ 28:61470c956807 {wat} |
226 @ 29:61470c956807 {wat} |
227 | Added h () |
227 | Added h () |
228 | |
228 | |
229 |
229 |
230 Clear the current topic and amending |
230 Clear the current topic and amending |
231 |
231 |
232 $ hg topic --clear |
232 $ hg topic --clear |
233 $ hg ci --amend |
233 $ hg ci --amend |
234 $ hg glog -r . |
234 $ hg glog -r . |
235 @ 29:b584fa49f42e {} |
235 @ 31:b584fa49f42e {} |
236 | Added h () |
236 | Added h () |
237 | |
237 | |
238 |
238 |
239 When the changeset does not has a topic but we have an active topic |
239 When the changeset does not has a topic but we have an active topic |
240 |
240 |
241 $ hg topic watwat |
241 $ hg topic watwat |
242 marked working directory as topic: watwat |
242 marked working directory as topic: watwat |
243 $ hg ci --amend |
243 $ hg ci --amend |
244 active topic 'watwat' grew its first changeset |
244 active topic 'watwat' grew its first changeset |
245 $ hg glog -r . |
245 $ hg glog -r . |
246 @ 30:a24c31c35013 {watwat} |
246 @ 33:a24c31c35013 {watwat} |
247 | Added h () |
247 | Added h () |
248 | |
248 | |
249 |
249 |
250 Testing changing topics on public changeset |
250 Testing changing topics on public changeset |
251 ------------------------------------------- |
251 ------------------------------------------- |
267 Testing the bookmark movement |
267 Testing the bookmark movement |
268 ----------------------------- |
268 ----------------------------- |
269 |
269 |
270 $ hg bookmark book |
270 $ hg bookmark book |
271 $ hg glog |
271 $ hg glog |
272 @ 30:a24c31c35013 {watwat} |
272 @ 33:a24c31c35013 {watwat} |
273 | Added h (book) |
273 | Added h (book) |
274 | |
274 | |
275 o 26:7c76c271395f {bar} |
275 o 26:7c76c271395f {bar} |
276 | Added g () |
276 | Added g () |
277 | |
277 | |
299 clearing empty topic "watwat" |
299 clearing empty topic "watwat" |
300 active topic 'watwat' is now empty |
300 active topic 'watwat' is now empty |
301 changed topic on 1 changes |
301 changed topic on 1 changes |
302 |
302 |
303 $ hg glog |
303 $ hg glog |
304 @ 31:c48d6d71b2d9 {} |
304 @ 34:c48d6d71b2d9 {} |
305 | Added h (book) |
305 | Added h (book) |
306 | |
306 | |
307 o 26:7c76c271395f {bar} |
307 o 26:7c76c271395f {bar} |
308 | Added g () |
308 | Added g () |
309 | |
309 | |
331 $ hg bookmark bookboo |
331 $ hg bookmark bookboo |
332 $ hg topic -r . movebook |
332 $ hg topic -r . movebook |
333 switching to topic movebook |
333 switching to topic movebook |
334 changed topic on 1 changes |
334 changed topic on 1 changes |
335 $ hg glog |
335 $ hg glog |
336 @ 32:1b83d11095b9 {movebook} |
336 @ 35:1b83d11095b9 {movebook} |
337 | Added h (book bookboo) |
337 | Added h (book bookboo) |
338 | |
338 | |
339 o 26:7c76c271395f {bar} |
339 o 26:7c76c271395f {bar} |
340 | Added g () |
340 | Added g () |
341 | |
341 | |
372 $ hg topic -r . watwat |
372 $ hg topic -r . watwat |
373 switching to topic watwat |
373 switching to topic watwat |
374 changed topic on 1 changes |
374 changed topic on 1 changes |
375 |
375 |
376 $ hg glog |
376 $ hg glog |
377 @ 33:894983f69e69 {watwat} |
377 @ 36:894983f69e69 {watwat} |
378 | Added g () |
378 | Added g () |
379 | |
379 | |
380 | o 32:1b83d11095b9 {movebook} |
380 | o 35:1b83d11095b9 {movebook} |
381 | | Added h (book bookboo) |
381 | | Added h (book bookboo) |
382 | | |
382 | | |
383 | x 26:7c76c271395f {bar} |
383 | x 26:7c76c271395f {bar} |
384 |/ Added g () |
384 |/ Added g () |
385 | |
385 | |
400 | |
400 | |
401 o 8:86a186070af2 {} |
401 o 8:86a186070af2 {} |
402 Added a () |
402 Added a () |
403 |
403 |
404 $ hg phase -r . |
404 $ hg phase -r . |
405 33: secret |
405 36: secret |