Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 4512:7a779a288793 mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:41:41 +0200
parents 2cbb9914d227 5da1d162ad50
children ef1c322c389d 653c42af172e
comparison
equal deleted inserted replaced
4359:2cbb9914d227 4512:7a779a288793
1356 Fortunately stack shows you a better visualization: 1356 Fortunately stack shows you a better visualization:
1357 1357
1358 $ hg stack 1358 $ hg stack
1359 ### topic: tools 1359 ### topic: tools
1360 ### target: default (branch), 2 behind 1360 ### target: default (branch), 2 behind
1361 s3$ Adding drill (unstable) 1361 s3$ Adding drill (orphan)
1362 s2$ Adding saw (unstable) 1362 s2$ Adding saw (orphan)
1363 s1@ Adding hammer to the shopping list (current) 1363 s1@ Adding hammer to the shopping list (current)
1364 s0^ add a pair of shoes (base) 1364 s0^ add a pair of shoes (base)
1365 1365
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
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
1378 s3$ Adding drill (unstable) 1378 s3$ Adding drill (orphan)
1379 s2@ Adding saw (current) 1379 s2@ Adding saw (current)
1380 s1: Adding hammer to the shopping list 1380 s1: Adding hammer to the shopping list
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: