comparison tests/test-evolve.t @ 4774:12a88b988875

branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 13:54:57 +0200
parents 184c64c81528 b6a7d2594ff3
children 5d50f3de4714 a66c9fc9c503
comparison
equal deleted inserted replaced
4762:75bc0a51809a 4774:12a88b988875
593 593
594 $ hg pick -r3 594 $ hg pick -r3
595 picking 3:0e84df4912da "add 3" 595 picking 3:0e84df4912da "add 3"
596 $ hg graft -r1 596 $ hg graft -r1
597 grafting 1:73d38bb17fd7 "add 1" 597 grafting 1:73d38bb17fd7 "add 1"
598 $ hg prune -r2 --succ . 598 $ hg prune -r2 --successor .
599 1 changesets pruned 599 1 changesets pruned
600 $ glog --hidden 600 $ glog --hidden
601 @ 6:417185465d2c@default(draft) add 1 601 @ 6:417185465d2c@default(draft) add 1
602 | 602 |
603 o 5:fa455b5098e0@default(draft) add 3 603 o 5:fa455b5098e0@default(draft) add 3