equal
deleted
inserted
replaced
151 o 0:07f494440405@default(public) bk:[] adda |
151 o 0:07f494440405@default(public) bk:[] adda |
152 |
152 |
153 |
153 |
154 Stabilize! |
154 Stabilize! |
155 |
155 |
156 $ hg evolve --any --dry-run --phasedivergent |
156 $ hg evolve --any --dry-run --phase-divergent |
157 recreate:[9] newer a |
157 recreate:[9] newer a |
158 atop:[6] newer a |
158 atop:[6] newer a |
159 hg rebase --rev d5c7ef82d003 --dest 66719795a494; |
159 hg rebase --rev d5c7ef82d003 --dest 66719795a494; |
160 hg update 1cf0aacfd363; |
160 hg update 1cf0aacfd363; |
161 hg revert --all --rev d5c7ef82d003; |
161 hg revert --all --rev d5c7ef82d003; |
162 hg commit --msg "bumped update to %s" (no-eol) |
162 hg commit --msg "bumped update to %s" (no-eol) |
163 $ hg evolve --any --confirm --phasedivergent |
163 $ hg evolve --any --confirm --phase-divergent |
164 recreate:[9] newer a |
164 recreate:[9] newer a |
165 atop:[6] newer a |
165 atop:[6] newer a |
166 perform evolve? [Ny] n |
166 perform evolve? [Ny] n |
167 abort: evolve aborted by user |
167 abort: evolve aborted by user |
168 [255] |
168 [255] |
169 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent |
169 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent |
170 recreate:[9] newer a |
170 recreate:[9] newer a |
171 atop:[6] newer a |
171 atop:[6] newer a |
172 perform evolve? [Ny] y |
172 perform evolve? [Ny] y |
173 rebasing to destination parent: 66719795a494 |
173 rebasing to destination parent: 66719795a494 |
174 computing new diff |
174 computing new diff |