292 base: [12] More addition |
292 base: [12] More addition |
293 merging "other" content-divergent changeset 'd2f173e25686' |
293 merging "other" content-divergent changeset 'd2f173e25686' |
294 resolving manifests |
294 resolving manifests |
295 merging a |
295 merging a |
296 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
296 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
297 amending changeset eacc9c8240fe |
|
298 committing files: |
297 committing files: |
299 a |
298 a |
300 committing manifest |
299 committing manifest |
301 committing changelog |
300 committing changelog |
302 committed changeset 15:f344982e63c4 |
301 working directory is now at 4d6ed26797bc |
303 working directory is now at f344982e63c4 |
|
304 $ hg st |
302 $ hg st |
305 $ glog |
303 $ glog |
306 @ 15:f344982e63c4@default(draft) bk:[] More addition |
304 @ 15:4d6ed26797bc@default(draft) bk:[] More addition |
307 | |
305 | |
308 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
306 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
309 | | |
307 | | |
310 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
308 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
311 | | |
309 | | |
314 o 5:66719795a494@default(public) bk:[changea] changea |
312 o 5:66719795a494@default(public) bk:[changea] changea |
315 | |
313 | |
316 o 0:07f494440405@default(public) bk:[] adda |
314 o 0:07f494440405@default(public) bk:[] adda |
317 |
315 |
318 $ hg summary |
316 $ hg summary |
319 parent: 15:f344982e63c4 tip |
317 parent: 15:4d6ed26797bc tip |
320 More addition |
318 More addition |
321 branch: default |
319 branch: default |
322 commit: (clean) |
320 commit: (clean) |
323 update: 2 new changesets, 2 branch heads (merge) |
321 update: 2 new changesets, 2 branch heads (merge) |
324 phases: 3 draft |
322 phases: 3 draft |
325 $ hg export . |
323 $ hg export . |
326 # HG changeset patch |
324 # HG changeset patch |
327 # User test |
325 # User test |
328 # Date 0 0 |
326 # Date 0 0 |
329 # Thu Jan 01 00:00:00 1970 +0000 |
327 # Thu Jan 01 00:00:00 1970 +0000 |
330 # Node ID f344982e63c462b1e44c0371c804685389e673a9 |
328 # Node ID 4d6ed26797bc392c0099e48402a5134e669f1a60 |
331 # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced |
329 # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced |
332 More addition |
330 More addition |
333 |
331 |
334 diff -r 7bc2f5967f5e -r f344982e63c4 a |
332 diff -r 7bc2f5967f5e -r 4d6ed26797bc a |
335 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
333 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
336 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
334 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
337 @@ -1,1 +1,9 @@ |
335 @@ -1,1 +1,9 @@ |
338 +jungle |
336 +jungle |
339 a |
337 a |
349 ------------------------------------------------- |
347 ------------------------------------------------- |
350 |
348 |
351 $ hg up --hidden 3932c176bbaa |
349 $ hg up --hidden 3932c176bbaa |
352 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
350 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
353 updated to hidden changeset 3932c176bbaa |
351 updated to hidden changeset 3932c176bbaa |
354 (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) |
352 (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) |
355 working directory parent is obsolete! (3932c176bbaa) |
353 working directory parent is obsolete! (3932c176bbaa) |
356 (use 'hg evolve' to update to its successor: f344982e63c4) |
354 (use 'hg evolve' to update to its successor: 4d6ed26797bc) |
357 $ echo 'gotta break' >> a |
355 $ echo 'gotta break' >> a |
358 $ hg amend |
356 $ hg amend |
359 2 new content-divergent changesets |
357 2 new content-divergent changesets |
360 # reamend so that the case is not the first precursor. |
358 # reamend so that the case is not the first precursor. |
361 $ hg amend -m "More addition (2)" |
359 $ hg amend -m "More addition (2)" |
379 o 0:07f494440405@default(public) bk:[] adda |
377 o 0:07f494440405@default(public) bk:[] adda |
380 |
378 |
381 |
379 |
382 $ hg evolve -qn --content-divergent |
380 $ hg evolve -qn --content-divergent |
383 hg update -c 0b336205a5d0 && |
381 hg update -c 0b336205a5d0 && |
384 hg merge f344982e63c4 && |
382 hg merge 4d6ed26797bc && |
385 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
383 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and 4d6ed26797bc"&& |
386 hg up -C 3932c176bbaa && |
384 hg up -C 3932c176bbaa && |
387 hg revert --all --rev tip && |
385 hg revert --all --rev tip && |
388 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
386 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
389 $ hg evolve --content-divergent |
387 $ hg evolve --content-divergent |
390 merge:[17] More addition (2) |
388 merge:[17] More addition (2) |
391 with: [15] More addition |
389 with: [15] More addition |
392 base: [12] More addition |
390 base: [12] More addition |
393 merging "other" content-divergent changeset 'f344982e63c4' |
391 merging "other" content-divergent changeset '4d6ed26797bc' |
394 merging a |
392 merging a |
395 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
393 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
396 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
394 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
397 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
395 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
398 [255] |
396 [255] |
411 |
409 |
412 $ hg resolve -m |
410 $ hg resolve -m |
413 (no more unresolved files) |
411 (no more unresolved files) |
414 continue: hg evolve --continue |
412 continue: hg evolve --continue |
415 $ hg evolve --continue |
413 $ hg evolve --continue |
416 working directory is now at e015aa78acee |
414 working directory is now at e8746835a2a1 |
417 $ glog |
415 $ glog |
418 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) |
416 @ 18:e8746835a2a1@default(draft) bk:[] More addition (2) |
419 | |
417 | |
420 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
418 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
421 | | |
419 | | |
422 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
420 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
423 | | |
421 | | |
430 $ hg exp |
428 $ hg exp |
431 # HG changeset patch |
429 # HG changeset patch |
432 # User test |
430 # User test |
433 # Date 0 0 |
431 # Date 0 0 |
434 # Thu Jan 01 00:00:00 1970 +0000 |
432 # Thu Jan 01 00:00:00 1970 +0000 |
435 # Node ID e015aa78acee692d26215fafdb7f70974682739c |
433 # Node ID e8746835a2a13122bc8c0ed84fe4ee35649af25d |
436 # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced |
434 # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced |
437 More addition (2) |
435 More addition (2) |
438 |
436 |
439 diff -r 7bc2f5967f5e -r e015aa78acee a |
437 diff -r 7bc2f5967f5e -r e8746835a2a1 a |
440 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
438 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
441 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
439 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
442 @@ -1,1 +1,9 @@ |
440 @@ -1,1 +1,9 @@ |
443 +jungle |
441 +jungle |
444 a |
442 a |