127 $ hg commit -m 'add c' |
127 $ hg commit -m 'add c' |
128 created new head |
128 created new head |
129 |
129 |
130 Get a successors of 8 on it |
130 Get a successors of 8 on it |
131 |
131 |
132 $ hg grab 8 |
132 $ hg grab 1cf0aacfd363 |
133 rebasing 8:1cf0aacfd363 "newer a" |
133 rebasing 8:1cf0aacfd363 "newer a" |
134 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
134 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
135 |
135 |
136 Add real change to the successors |
136 Add real change to the successors |
137 |
137 |
138 $ echo 'babar' >> a |
138 $ echo 'babar' >> a |
139 $ hg amend |
139 $ hg amend |
140 |
140 |
141 Make precursors public |
141 Make precursors public |
142 |
142 |
143 $ hg phase --hidden --public 8 |
143 $ hg phase --hidden --public 1cf0aacfd363 |
144 1 new bumped changesets |
144 1 new bumped changesets |
145 $ glog |
145 $ glog |
146 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
146 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
147 | |
147 | |
148 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
148 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
154 o 0:07f494440405@default(public) bk:[] adda |
154 o 0:07f494440405@default(public) bk:[] adda |
155 |
155 |
156 |
156 |
157 Stabilize! |
157 Stabilize! |
158 |
158 |
159 $ hg evolve --any --dry-run --bumped |
159 $ hg evolve --any --dry-run --phasedivergent |
160 recreate:[12] newer a |
160 recreate:[12] newer a |
161 atop:[8] newer a |
161 atop:[8] newer a |
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
163 hg update 1cf0aacfd363; |
163 hg update 1cf0aacfd363; |
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
165 hg commit --msg "bumped update to %s" (no-eol) |
165 hg commit --msg "bumped update to %s" (no-eol) |
166 $ hg evolve --any --confirm --bumped |
166 $ hg evolve --any --confirm --phasedivergent |
167 recreate:[12] newer a |
167 recreate:[12] newer a |
168 atop:[8] newer a |
168 atop:[8] newer a |
169 perform evolve? [Ny] n |
169 perform evolve? [Ny] n |
170 abort: evolve aborted by user |
170 abort: evolve aborted by user |
171 [255] |
171 [255] |
172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped |
172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent |
173 recreate:[12] newer a |
173 recreate:[12] newer a |
174 atop:[8] newer a |
174 atop:[8] newer a |
175 perform evolve? [Ny] y |
175 perform evolve? [Ny] y |
176 rebasing to destination parent: 66719795a494 |
176 rebasing to destination parent: 66719795a494 |
177 computing new diff |
177 computing new diff |
217 | |
217 | |
218 o 0:07f494440405@default(public) bk:[] adda |
218 o 0:07f494440405@default(public) bk:[] adda |
219 |
219 |
220 $ echo 'babar' >> a |
220 $ echo 'babar' >> a |
221 $ hg amend |
221 $ hg amend |
222 $ hg up --hidden 15 |
222 $ hg up --hidden 3932c176bbaa |
223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
224 working directory parent is obsolete! (3932c176bbaa) |
224 working directory parent is obsolete! (3932c176bbaa) |
225 (use 'hg evolve' to update to its successor: d2f173e25686) |
225 (use 'hg evolve' to update to its successor: d2f173e25686) |
226 $ mv a a.old |
226 $ mv a a.old |
227 $ echo 'jungle' > a |
227 $ echo 'jungle' > a |
245 o 0:07f494440405@default(public) bk:[] adda |
245 o 0:07f494440405@default(public) bk:[] adda |
246 |
246 |
247 |
247 |
248 Stabilize it |
248 Stabilize it |
249 |
249 |
250 $ hg evolve -qn --confirm --divergent |
250 $ hg evolve -qn --confirm --contentdivergent |
251 merge:[19] More addition |
251 merge:[19] More addition |
252 with: [17] More addition |
252 with: [17] More addition |
253 base: [15] More addition |
253 base: [15] More addition |
254 perform evolve? [Ny] n |
254 perform evolve? [Ny] n |
255 abort: evolve aborted by user |
255 abort: evolve aborted by user |
256 [255] |
256 [255] |
257 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --divergent |
257 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent |
258 merge:[19] More addition |
258 merge:[19] More addition |
259 with: [17] More addition |
259 with: [17] More addition |
260 base: [15] More addition |
260 base: [15] More addition |
261 perform evolve? [Ny] y |
261 perform evolve? [Ny] y |
262 hg update -c eacc9c8240fe && |
262 hg update -c eacc9c8240fe && |
263 hg merge d2f173e25686 && |
263 hg merge d2f173e25686 && |
264 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
264 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
265 hg up -C 3932c176bbaa && |
265 hg up -C 3932c176bbaa && |
266 hg revert --all --rev tip && |
266 hg revert --all --rev tip && |
267 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
267 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
268 $ hg evolve -v --divergent |
268 $ hg evolve -v --contentdivergent |
269 merge:[19] More addition |
269 merge:[19] More addition |
270 with: [17] More addition |
270 with: [17] More addition |
271 base: [15] More addition |
271 base: [15] More addition |
272 merging divergent changeset |
272 merging divergent changeset |
273 resolving manifests |
273 resolving manifests |
330 +babar |
330 +babar |
331 |
331 |
332 Check conflict during divergence resolution |
332 Check conflict during divergence resolution |
333 ------------------------------------------------- |
333 ------------------------------------------------- |
334 |
334 |
335 $ hg up --hidden 15 |
335 $ hg up --hidden 3932c176bbaa |
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 working directory parent is obsolete! (3932c176bbaa) |
337 working directory parent is obsolete! (3932c176bbaa) |
338 (use 'hg evolve' to update to its successor: f344982e63c4) |
338 (use 'hg evolve' to update to its successor: f344982e63c4) |
339 $ echo 'gotta break' >> a |
339 $ echo 'gotta break' >> a |
340 $ hg amend |
340 $ hg amend |
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 --divergent |
347 $ hg evolve -qn --contentdivergent |
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 --divergent |
354 $ hg evolve --contentdivergent |
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 while merging a! (edit, then use 'hg resolve --mark') |
359 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |