equal
deleted
inserted
replaced
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 |