Mercurial > evolve

comparison tests/test-evolve-bumped.t @ 3001:67b59d1657cf mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat-test: merge future 6.7.0 into 4.2 compat branch Couple feature to disable and other various test impact.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:07:22 +0200
parents bd7e8be29542
children 945a0989e41b
comparison
equal deleted inserted replaced
2808:f47ed78ab17b 3001:67b59d1657cf
67 pulling from ../public 67 pulling from ../public
68 searching for changes 68 searching for changes
69 no changes found 69 no changes found
70 1 new bumped changesets 70 1 new bumped changesets
71 71
72 $ hg evolve -a -A --bumped 72 $ hg evolve -a -A --phasedivergent
73 recreate:[2] tweak a 73 recreate:[2] tweak a
74 atop:[1] modify a 74 atop:[1] modify a
75 computing new diff 75 computing new diff
76 committed as 4d1169d82e47 76 committed as 4d1169d82e47
77 working directory is now at 4d1169d82e47 77 working directory is now at 4d1169d82e47
119 |/ 119 |/
120 o 1:4d1169d82e47@default(public) modify a 120 o 1:4d1169d82e47@default(public) modify a
121 | 121 |
122 o 0:d3873e73d99e@default(public) init 122 o 0:d3873e73d99e@default(public) init
123 123
124 $ hg evolve --all --bumped 124 $ hg evolve --all --phasedivergent
125 skipping b28e84916d8c : we do not handle merge yet 125 skipping b28e84916d8c : we do not handle merge yet