Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 2976:e5edfb5aba0c
topics/tuto: be more complete over the de-orphaning action within a topic
| author | Aurélien Campéas |
|---|---|
| date | Thu, 21 Sep 2017 17:00:04 +0200 |
| parents | 7964b9138549 |
| children | d1972a75c7d7 |
comparison
equal
deleted
inserted
replaced
| 2975:7964b9138549 | 2976:e5edfb5aba0c |
|---|---|
| 1333 t3$ Adding drill (unstable) | 1333 t3$ Adding drill (unstable) |
| 1334 t2$ Adding saw (unstable) | 1334 t2$ Adding saw (unstable) |
| 1335 t1@ Adding hammer to the shopping list (current) | 1335 t1@ Adding hammer to the shopping list (current) |
| 1336 t0^ add a pair of shoes (base) | 1336 t0^ add a pair of shoes (base) |
| 1337 | 1337 |
| 1338 It's easy to stabilize the situation, `next` has an `--evolve` option: | 1338 It's easy to stabilize the situation, `next` has an `--evolve` option. It will |
| 1339 do the necessary relocation of `t2` and `t3` over the new `t1` without having | |
| 1340 to do that rebase by hand.: | |
| 1339 | 1341 |
| 1340 $ hg next --evolve | 1342 $ hg next --evolve |
| 1341 move:[14] Adding saw | 1343 move:[14] Adding saw |
| 1342 atop:[18] Adding hammer to the shopping list | 1344 atop:[18] Adding hammer to the shopping list |
| 1343 working directory now at d5c51ee5762a | 1345 working directory now at d5c51ee5762a |