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