601 recreate:[10] added x to x |
601 recreate:[10] added x to x |
602 atop:[9] added x to x |
602 atop:[9] added x to x |
603 rebasing to destination parent: 502e73736632 |
603 rebasing to destination parent: 502e73736632 |
604 (leaving bookmark bm) |
604 (leaving bookmark bm) |
605 computing new diff |
605 computing new diff |
606 committed as 5388376cb2f0 |
606 committed as 2352021b3785 |
607 working directory is now at 5388376cb2f0 |
607 working directory is now at 2352021b3785 |
608 |
608 |
609 XXX: we should not have created a new commit here |
609 XXX: we should move bookmark here |
610 $ hg glog |
610 $ hg glog |
611 @ 12:5388376cb2f0 phase-divergent update to 2352021b3785: |
611 x 11:b1a0e143e32b added x to x |
612 | |
612 | (bm) draft |
613 | added x to x |
613 | @ 9:2352021b3785 added x to x |
614 | () draft |
|
615 | x 11:b1a0e143e32b added x to x |
|
616 | | (bm) draft |
|
617 o | 9:2352021b3785 added x to x |
|
618 |/ () public |
614 |/ () public |
619 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
615 o 8:502e73736632 phase-divergent update to b756eb10ea73: |
620 | |
616 | |
621 | foo to bar |
617 | foo to bar |
622 | () public |
618 | () public |
631 o 1:4d1169d82e47 modify a |
627 o 1:4d1169d82e47 modify a |
632 | () public |
628 | () public |
633 o 0:d3873e73d99e init |
629 o 0:d3873e73d99e init |
634 () public |
630 () public |
635 |
631 |
636 $ hg obslog -r . |
632 $ hg obslog -r . b1a0e143e32b --all --hidden |
637 @ 5388376cb2f0 (12) phase-divergent update to 2352021b3785: |
|
638 | |
|
639 x b1a0e143e32b (11) added x to x |
633 x b1a0e143e32b (11) added x to x |
640 | rewritten(description, parent, content) as 5388376cb2f0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
634 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
641 | |
635 | |
642 x 334e300d6db5 (10) added x to x |
636 x 334e300d6db5 (10) added x to x |
643 | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
637 | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
644 | |
638 | |
645 o 2352021b3785 (9) added x to x |
639 @ 2352021b3785 (9) added x to x |
646 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
640 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
647 |
641 |
648 XXX: The existence of this changeset is wrong, moreover its diff is wrong |
642 |
649 $ hg exp |
643 $ hg exp |
650 # HG changeset patch |
644 # HG changeset patch |
651 # User test |
645 # User test |
652 # Date 0 0 |
646 # Date 0 0 |
653 # Thu Jan 01 00:00:00 1970 +0000 |
647 # Thu Jan 01 00:00:00 1970 +0000 |
654 # Node ID 5388376cb2f0f9bc4842361fb16fe66ce5cc2f6d |
648 # Node ID 2352021b37851be226ebed109b0eb6eada918566 |
655 # Parent 2352021b37851be226ebed109b0eb6eada918566 |
649 # Parent 502e737366322886cf628276aa0a2796904453b4 |
656 phase-divergent update to 2352021b3785: |
|
657 |
|
658 added x to x |
650 added x to x |
659 |
651 |
660 diff -r 2352021b3785 -r 5388376cb2f0 bar |
652 diff -r 502e73736632 -r 2352021b3785 x |
661 --- a/bar Thu Jan 01 00:00:00 1970 +0000 |
653 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
662 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
654 +++ b/x Thu Jan 01 00:00:00 1970 +0000 |
663 @@ -1,1 +0,0 @@ |
655 @@ -0,0 +1,1 @@ |
664 -foo |
656 +x |