25 $ hg up 1 |
25 $ hg up 1 |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 (leaving bookmark changea) |
27 (leaving bookmark changea) |
28 $ echo a >> a |
28 $ echo a >> a |
29 $ hg amend -m changea |
29 $ hg amend -m changea |
30 1 new orphan changesets |
|
31 $ hg evolve -v --confirm |
30 $ hg evolve -v --confirm |
32 move:[2] changea |
31 move:[2] changea |
33 atop:[3] changea |
32 atop:[3] changea |
34 perform evolve? [Ny] n |
33 perform evolve? [Ny] n |
35 abort: evolve aborted by user |
34 abort: evolve aborted by user |
73 gdown have been deprecated in favor of previous |
72 gdown have been deprecated in favor of previous |
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 [3] changea |
74 [3] changea |
76 $ echo 'a' > a |
75 $ echo 'a' > a |
77 $ hg amend |
76 $ hg amend |
78 1 new orphan changesets |
|
79 $ hg evolve |
77 $ hg evolve |
80 move:[4] newer a |
78 move:[4] newer a |
81 atop:[5] changea |
79 atop:[5] changea |
82 merging a |
80 merging a |
83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
81 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
234 o 0:07f494440405@default(public) bk:[] adda |
231 o 0:07f494440405@default(public) bk:[] adda |
235 |
232 |
236 $ echo 'babar' >> a |
233 $ echo 'babar' >> a |
237 $ hg amend |
234 $ hg amend |
238 $ hg up --hidden 3932c176bbaa |
235 $ hg up --hidden 3932c176bbaa |
239 updating to a hidden changeset 3932c176bbaa |
|
240 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) |
|
241 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
236 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
242 working directory parent is obsolete! (3932c176bbaa) |
237 working directory parent is obsolete! (3932c176bbaa) |
243 (use 'hg evolve' to update to its successor: d2f173e25686) |
238 (use 'hg evolve' to update to its successor: d2f173e25686) |
244 $ mv a a.old |
239 $ mv a a.old |
245 $ echo 'jungle' > a |
240 $ echo 'jungle' > a |
246 $ cat a.old >> a |
241 $ cat a.old >> a |
247 $ rm a.old |
242 $ rm a.old |
248 $ hg amend |
243 $ hg amend |
249 2 new content-divergent changesets |
|
250 $ glog |
244 $ glog |
251 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
245 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
252 | |
246 | |
253 | * 13:d2f173e25686@default(draft) bk:[] More addition |
247 | o 13:d2f173e25686@default(draft) bk:[] More addition |
254 |/ |
248 |/ |
255 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
249 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
256 | | |
250 | | |
257 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
251 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
258 | | |
252 | | |
342 |
336 |
343 Check conflict during divergence resolution |
337 Check conflict during divergence resolution |
344 ------------------------------------------------- |
338 ------------------------------------------------- |
345 |
339 |
346 $ hg up --hidden 3932c176bbaa |
340 $ hg up --hidden 3932c176bbaa |
347 updating to a hidden changeset 3932c176bbaa |
|
348 (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) |
|
349 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
350 working directory parent is obsolete! (3932c176bbaa) |
342 working directory parent is obsolete! (3932c176bbaa) |
351 (use 'hg evolve' to update to its successor: 4d6ed26797bc) |
343 (use 'hg evolve' to update to its successor: 4d6ed26797bc) |
352 $ echo 'gotta break' >> a |
344 $ echo 'gotta break' >> a |
353 $ hg amend |
345 $ hg amend |
354 2 new content-divergent changesets |
|
355 # reamend so that the case is not the first precursor. |
346 # reamend so that the case is not the first precursor. |
356 $ hg amend -m "More addition (2)" |
347 $ hg amend -m "More addition (2)" |
357 $ hg phase 'contentdivergent()' |
348 $ hg phase 'contentdivergent()' |
358 15: draft |
349 15: draft |
359 17: draft |
350 17: draft |
360 |
351 |
361 $ glog |
352 $ glog |
362 @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) |
353 @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) |
363 | |
354 | |
364 | * 15:4d6ed26797bc@default(draft) bk:[] More addition |
355 | o 15:4d6ed26797bc@default(draft) bk:[] More addition |
365 |/ |
356 |/ |
366 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
357 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
367 | | |
358 | | |
368 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
359 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
369 | | |
360 | | |