156 o 0:07f494440405@default(public) bk:[] adda |
156 o 0:07f494440405@default(public) bk:[] adda |
157 |
157 |
158 |
158 |
159 Stabilize! |
159 Stabilize! |
160 |
160 |
161 $ hg evolve --any --dry-run |
161 $ hg evolve --any --dry-run --bumped |
162 recreate:[12] newer a |
162 recreate:[12] newer a |
163 atop:[8] newer a |
163 atop:[8] newer a |
164 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
164 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
165 hg update 1cf0aacfd363; |
165 hg update 1cf0aacfd363; |
166 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
166 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
167 hg commit --msg "bumped update to %s" (no-eol) |
167 hg commit --msg "bumped update to %s" (no-eol) |
168 $ hg evolve --any --confirm |
168 $ hg evolve --any --confirm --bumped |
169 recreate:[12] newer a |
169 recreate:[12] newer a |
170 atop:[8] newer a |
170 atop:[8] newer a |
171 perform evolve? [Ny] n |
171 perform evolve? [Ny] n |
172 abort: evolve aborted by user |
172 abort: evolve aborted by user |
173 [255] |
173 [255] |
174 $ echo y | hg evolve --any --confirm --config ui.interactive=True |
174 $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped |
175 recreate:[12] newer a |
175 recreate:[12] newer a |
176 atop:[8] newer a |
176 atop:[8] newer a |
177 perform evolve? [Ny] y |
177 perform evolve? [Ny] y |
178 rebasing to destination parent: 66719795a494 |
178 rebasing to destination parent: 66719795a494 |
179 computing new diff |
179 computing new diff |
246 o 0:07f494440405@default(public) bk:[] adda |
246 o 0:07f494440405@default(public) bk:[] adda |
247 |
247 |
248 |
248 |
249 Stabilize it |
249 Stabilize it |
250 |
250 |
251 $ hg evolve -qn --confirm |
251 $ hg evolve -qn --confirm --divergent |
252 merge:[19] More addition |
252 merge:[19] More addition |
253 with: [17] More addition |
253 with: [17] More addition |
254 base: [15] More addition |
254 base: [15] More addition |
255 perform evolve? [Ny] n |
255 perform evolve? [Ny] n |
256 abort: evolve aborted by user |
256 abort: evolve aborted by user |
257 [255] |
257 [255] |
258 $ echo y | hg evolve -qn --confirm --config ui.interactive=True |
258 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --divergent |
259 merge:[19] More addition |
259 merge:[19] More addition |
260 with: [17] More addition |
260 with: [17] More addition |
261 base: [15] More addition |
261 base: [15] More addition |
262 perform evolve? [Ny] y |
262 perform evolve? [Ny] y |
263 hg update -c eacc9c8240fe && |
263 hg update -c eacc9c8240fe && |
264 hg merge d2f173e25686 && |
264 hg merge d2f173e25686 && |
265 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
265 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
266 hg up -C 3932c176bbaa && |
266 hg up -C 3932c176bbaa && |
267 hg revert --all --rev tip && |
267 hg revert --all --rev tip && |
268 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
268 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
269 $ hg evolve -v |
269 $ hg evolve -v --divergent |
270 merge:[19] More addition |
270 merge:[19] More addition |
271 with: [17] More addition |
271 with: [17] More addition |
272 base: [15] More addition |
272 base: [15] More addition |
273 merging divergent changeset |
273 merging divergent changeset |
274 resolving manifests |
274 resolving manifests |
342 # reamend so that the case is not the first precursor. |
342 # reamend so that the case is not the first precursor. |
343 $ hg amend -m "More addition (2)" |
343 $ hg amend -m "More addition (2)" |
344 $ hg phase 'divergent()' |
344 $ hg phase 'divergent()' |
345 21: draft |
345 21: draft |
346 24: draft |
346 24: draft |
347 $ hg evolve -qn |
347 $ hg evolve -qn --divergent |
348 hg update -c 0b336205a5d0 && |
348 hg update -c 0b336205a5d0 && |
349 hg merge f344982e63c4 && |
349 hg merge f344982e63c4 && |
350 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
350 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
351 hg up -C 3932c176bbaa && |
351 hg up -C 3932c176bbaa && |
352 hg revert --all --rev tip && |
352 hg revert --all --rev tip && |
353 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
353 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
354 $ hg evolve |
354 $ hg evolve --divergent |
355 merge:[24] More addition (2) |
355 merge:[24] More addition (2) |
356 with: [21] More addition |
356 with: [21] More addition |
357 base: [15] More addition |
357 base: [15] More addition |
358 merging a |
358 merging a |
359 warning: conflicts during merge. |
359 warning: conflicts during merge. |