135 merge:[4] added c |
135 merge:[4] added c |
136 with: [5] updated c |
136 with: [5] updated c |
137 base: [2] added c |
137 base: [2] added c |
138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
140 committed as 3b336cbee992 |
140 committed as 0941937e8302 |
141 working directory is now at 3b336cbee992 |
141 working directory is now at 0941937e8302 |
142 |
142 |
143 $ hg glog -p |
143 $ hg glog -p |
144 @ 8:3b336cbee992 phase-divergent update to c0d7ee6604ea: |
144 @ 8:0941937e8302 phase-divergent update to c0d7ee6604ea: |
145 | draft |
145 | draft |
146 | |
146 | |
147 | diff -r c0d7ee6604ea -r 3b336cbee992 c |
147 | diff -r c0d7ee6604ea -r 0941937e8302 c |
148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
150 | @@ -1,1 +1,2 @@ |
150 | @@ -1,1 +1,2 @@ |
151 | c |
151 | c |
152 | +cc |
152 | +cc |
364 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
364 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
365 @@ -0,0 +1,1 @@ |
365 @@ -0,0 +1,1 @@ |
366 +a |
366 +a |
367 |
367 |
368 |
368 |
|
369 $ hg debugobsolete |
|
370 9150fe93bec603cd88d05cda9f6ff13420cb53e9 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'} |
|
371 9150fe93bec603cd88d05cda9f6ff13420cb53e9 e568fd1029bbe9d506275bbb9a034a0509d80324 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
369 $ hg obslog --all --rev tip --patch |
372 $ hg obslog --all --rev tip --patch |
370 @ 93cd84bbdaca (5) added d |
373 @ 93cd84bbdaca (5) added d |
|
374 | amended(content) from 9150fe93bec6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
375 | diff -r 9150fe93bec6 -r 93cd84bbdaca d |
|
376 | --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
377 | +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
378 | @@ -1,1 +1,1 @@ |
|
379 | -d |
|
380 | +dd |
|
381 | |
371 | |
382 | |
372 | * e568fd1029bb (4) added c e |
383 | * e568fd1029bb (4) added c e |
373 |/ |
384 |/ rewritten(description, parent, content) from 9150fe93bec6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
385 | (No patch available, changesets rebased) |
|
386 | |
374 x 9150fe93bec6 (3) added d |
387 x 9150fe93bec6 (3) added d |
375 amended(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
376 diff -r 9150fe93bec6 -r 93cd84bbdaca d |
|
377 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
378 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
379 @@ -1,1 +1,1 @@ |
|
380 -d |
|
381 +dd |
|
382 |
|
383 rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
384 (No patch available, changesets rebased) |
|
385 |
388 |
386 |
389 |
387 $ hg evolve --content-divergent --any --update |
390 $ hg evolve --content-divergent --any --update |
388 merge:[5] added d |
391 merge:[5] added d |
389 with: [4] added c e |
392 with: [4] added c e |
442 $ hg resolve -m d |
445 $ hg resolve -m d |
443 (no more unresolved files) |
446 (no more unresolved files) |
444 continue: hg evolve --continue |
447 continue: hg evolve --continue |
445 |
448 |
446 $ hg evolve --continue |
449 $ hg evolve --continue |
447 committed as bc1f4610744c |
450 committed as bb4d94ae1a5a |
448 working directory is now at bc1f4610744c |
451 working directory is now at bb4d94ae1a5a |
449 |
452 |
450 $ hg export |
453 $ hg export |
451 # HG changeset patch |
454 # HG changeset patch |
452 # User test |
455 # User test |
453 # Date 0 0 |
456 # Date 0 0 |
454 # Thu Jan 01 00:00:00 1970 +0000 |
457 # Thu Jan 01 00:00:00 1970 +0000 |
455 # Node ID bc1f4610744c6aa0e851d3876a61bfff6243b31c |
458 # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560 |
456 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
459 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
457 phase-divergent update to 93cd84bbdaca: |
460 phase-divergent update to 93cd84bbdaca: |
458 |
461 |
459 added c e |
462 added c e |
460 |
463 |
461 diff -r 93cd84bbdaca -r bc1f4610744c d |
464 diff -r 93cd84bbdaca -r bb4d94ae1a5a d |
462 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
465 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
463 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
466 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
464 @@ -1,1 +1,1 @@ |
467 @@ -1,1 +1,1 @@ |
465 -dd |
468 -dd |
466 +resolved |
469 +resolved |
467 diff -r 93cd84bbdaca -r bc1f4610744c e |
470 diff -r 93cd84bbdaca -r bb4d94ae1a5a e |
468 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
469 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
472 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
470 @@ -0,0 +1,1 @@ |
473 @@ -0,0 +1,1 @@ |
471 +e |
474 +e |
472 |
475 |
750 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
753 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
751 +++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
754 +++ b/c_F Thu Jan 01 00:00:00 1970 +0000 |
752 @@ -0,0 +1,1 @@ |
755 @@ -0,0 +1,1 @@ |
753 +c_F |
756 +c_F |
754 |
757 |
|
758 $ hg debugobsolete |
|
759 4ab2719bbab9c0f4addf11ab7fa3cf3e1a832c2d c7d2d47c7240562be5cbd1a24080dd0396178709 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
760 77ccbf8d837e0eb67e09569335146263e7d61551 a52ac76b45f523a039fc4a938d79874f4bdb1a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
761 4ab2719bbab9c0f4addf11ab7fa3cf3e1a832c2d b4a584aea4bd8d771184530d445a582251275f37 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
762 77ccbf8d837e0eb67e09569335146263e7d61551 8ae8db670b4ad2385b9e008122af42ef6048a675 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
763 b4a584aea4bd8d771184530d445a582251275f37 0773642cfa95002f7937f44bec95dd208564c64e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
764 0773642cfa95002f7937f44bec95dd208564c64e c7d2d47c7240562be5cbd1a24080dd0396178709 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
765 8ae8db670b4ad2385b9e008122af42ef6048a675 6a87ed4aa31771f9041ca1260a91f7185f38f15c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
766 6a87ed4aa31771f9041ca1260a91f7185f38f15c a52ac76b45f523a039fc4a938d79874f4bdb1a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
755 $ hg obslog --rev a52ac76b45f5 |
767 $ hg obslog --rev a52ac76b45f5 |
756 @ a52ac76b45f5 (8) c_F |
768 @ a52ac76b45f5 (8) c_F |
757 |\ |
769 |\ rewritten from 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
770 | | rebased(parent) from 77ccbf8d837e using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
771 | | |
758 x | 6a87ed4aa317 (12) c_F |
772 x | 6a87ed4aa317 (12) c_F |
759 | | rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
773 | | rebased(parent) from 8ae8db670b4a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
760 | | |
774 | | |
761 x | 8ae8db670b4a (10) c_F |
775 x | 8ae8db670b4a (10) c_F |
762 |/ rebased(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
776 |/ rebased(parent) from 77ccbf8d837e using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
763 | |
777 | |
764 x 77ccbf8d837e (6) c_F |
778 x 77ccbf8d837e (6) c_F |
765 rebased(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
779 |
766 rebased(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
767 |
|