369 $ hg debugobsolete |
369 $ hg debugobsolete |
370 9150fe93bec603cd88d05cda9f6ff13420cb53e9 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'prune', 'user': 'test'} |
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'} |
371 9150fe93bec603cd88d05cda9f6ff13420cb53e9 e568fd1029bbe9d506275bbb9a034a0509d80324 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
372 $ hg obslog --all --rev tip --patch |
372 $ hg obslog --all --rev tip --patch |
373 @ 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 | |
374 | |
382 | |
375 | * e568fd1029bb (4) added c e |
383 | * e568fd1029bb (4) added c e |
376 |/ |
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 | |
377 x 9150fe93bec6 (3) added d |
387 x 9150fe93bec6 (3) added d |
378 amended(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
379 diff -r 9150fe93bec6 -r 93cd84bbdaca d |
|
380 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
381 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
382 @@ -1,1 +1,1 @@ |
|
383 -d |
|
384 +dd |
|
385 |
|
386 rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
387 (No patch available, changesets rebased) |
|
388 |
388 |
389 |
389 |
390 $ hg evolve --content-divergent --any --update |
390 $ hg evolve --content-divergent --any --update |
391 merge:[5] added d |
391 merge:[5] added d |
392 with: [4] added c e |
392 with: [4] added c e |
764 0773642cfa95002f7937f44bec95dd208564c64e c7d2d47c7240562be5cbd1a24080dd0396178709 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', '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'} |
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'} |
766 6a87ed4aa31771f9041ca1260a91f7185f38f15c a52ac76b45f523a039fc4a938d79874f4bdb1a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
767 $ hg obslog --rev a52ac76b45f5 |
767 $ hg obslog --rev a52ac76b45f5 |
768 @ a52ac76b45f5 (8) c_F |
768 @ a52ac76b45f5 (8) c_F |
769 |\ |
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 | | |
770 x | 6a87ed4aa317 (12) c_F |
772 x | 6a87ed4aa317 (12) c_F |
771 | | 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) |
772 | | |
774 | | |
773 x | 8ae8db670b4a (10) c_F |
775 x | 8ae8db670b4a (10) c_F |
774 |/ 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) |
775 | |
777 | |
776 x 77ccbf8d837e (6) c_F |
778 x 77ccbf8d837e (6) c_F |
777 rebased(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
779 |
778 rebased(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
779 |
|