Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 4359:2cbb9914d227 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:54:43 -0500 |
| parents | f555039d1a08 914b9e55f76e |
| children | 8bd60e09dfb4 7a779a288793 |
comparison
equal
deleted
inserted
replaced
| 4312:108b08a16260 | 4359:2cbb9914d227 |
|---|---|
| 1366 It's easy to stabilize the situation, `next` has an `--evolve` option. It will | 1366 It's easy to stabilize the situation, `next` has an `--evolve` option. It will |
| 1367 do the necessary relocation of `s2` and `s3` over the new `s1` without having | 1367 do the necessary relocation of `s2` and `s3` over the new `s1` without having |
| 1368 to do that rebase by hand.: | 1368 to do that rebase by hand.: |
| 1369 | 1369 |
| 1370 $ hg next --evolve | 1370 $ hg next --evolve |
| 1371 move:[14] Adding saw | 1371 move:[s2] Adding saw |
| 1372 atop:[18] Adding hammer to the shopping list | 1372 atop:[s1] Adding hammer to the shopping list |
| 1373 working directory now at d5c51ee5762a | 1373 working directory now at d5c51ee5762a |
| 1374 | 1374 |
| 1375 $ hg stack | 1375 $ hg stack |
| 1376 ### topic: tools | 1376 ### topic: tools |
| 1377 ### target: default (branch), 2 behind | 1377 ### target: default (branch), 2 behind |
| 1381 s0^ add a pair of shoes (base) | 1381 s0^ add a pair of shoes (base) |
| 1382 | 1382 |
| 1383 One more to go: | 1383 One more to go: |
| 1384 | 1384 |
| 1385 $ hg next --evolve | 1385 $ hg next --evolve |
| 1386 move:[15] Adding drill | 1386 move:[s3] Adding drill |
| 1387 atop:[19] Adding saw | 1387 atop:[s2] Adding saw |
| 1388 working directory now at bae3758e46bf | 1388 working directory now at bae3758e46bf |
| 1389 | 1389 |
| 1390 $ hg stack | 1390 $ hg stack |
| 1391 ### topic: tools | 1391 ### topic: tools |
| 1392 ### target: default (branch), 2 behind | 1392 ### target: default (branch), 2 behind |