566 o changeset: 0:eba9c2249fe7 |
566 o changeset: 0:eba9c2249fe7 |
567 user: test |
567 user: test |
568 date: Thu Jan 01 00:00:00 1970 +0000 |
568 date: Thu Jan 01 00:00:00 1970 +0000 |
569 summary: c_ROOT |
569 summary: c_ROOT |
570 |
570 |
|
571 |
|
572 rewind a fold |
|
573 ------------- |
|
574 |
|
575 setup |
|
576 ````` |
|
577 |
|
578 $ echo 'default-date = 3 0' >> $HGRCPATH |
|
579 |
|
580 note: the orphan creation is unfortunate, and should be fixed later. |
|
581 |
|
582 Actual Rewind |
|
583 ````````````` |
|
584 |
|
585 $ hg rewind --to '9576e80d6851+a0316c4c5417' --hidden |
|
586 1 new orphan changesets |
|
587 rewinded to 2 changesets |
|
588 (1 changesets obsoleted) |
|
589 working directory is now at d3bb9de71a17 |
|
590 $ hg debugobsolete |
|
591 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'} |
|
592 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'} |
|
593 9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'} |
|
594 a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'} |
|
595 9576e80d6851ce79cd535e2dc5fa01b444d89a39 d3bb9de71a17a85301bce02abc13114d2bc11615 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'} |
|
596 a0316c4c54179357e71d068fb8884678ebc7c351 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'} |
|
597 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 d3bb9de71a17a85301bce02abc13114d2bc11615 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '46', 'operation': 'rewind', 'user': 'test'} |
|
598 $ hg obslog -r -2: |
|
599 o 73a1ac2e570d (8) c_CD0 |
|
600 |\ |
|
601 +---@ d3bb9de71a17 (7) c_CD0 |
|
602 | | | |
|
603 x---+ 4535d0af405c (6) c_CD0 |
|
604 |\| | rewritten(meta, date, parent, content) as 73a1ac2e570d, d3bb9de71a17 using rewind by test (Thu Jan 01 00:00:03 1970 +0000) |
|
605 | | | |
|
606 +---x 9576e80d6851 (5) c_CD0 |
|
607 | | rewritten(meta, parent, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) |
|
608 | | rewritten(meta, date) as d3bb9de71a17 using rewind by test (Thu Jan 01 00:00:03 1970 +0000) |
|
609 | | |
|
610 | x a0316c4c5417 (4) c_CD0 |
|
611 |/ rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) |
|
612 | rewritten(meta, date) as 73a1ac2e570d using rewind by test (Thu Jan 01 00:00:03 1970 +0000) |
|
613 | |
|
614 x 49fb7d900906 (3) c_CD0 |
|
615 rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) |
|
616 rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000) |
|
617 |
|
618 $ hg log -G |
|
619 o changeset: 8:73a1ac2e570d |
|
620 | tag: tip |
|
621 | parent: 2:7e594302a05d |
|
622 | user: test |
|
623 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
624 | summary: c_CD0 |
|
625 | |
|
626 | @ changeset: 7:d3bb9de71a17 |
|
627 | | parent: 4:a0316c4c5417 |
|
628 | | user: test |
|
629 | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
630 | | instability: orphan |
|
631 | | summary: c_CD0 |
|
632 | | |
|
633 | x changeset: 4:a0316c4c5417 |
|
634 |/ parent: 2:7e594302a05d |
|
635 | user: test |
|
636 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
637 | obsolete: split using rewind as 8:73a1ac2e570d, 7:d3bb9de71a17 |
|
638 | summary: c_CD0 |
|
639 | |
|
640 o changeset: 2:7e594302a05d |
|
641 | user: test |
|
642 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
643 | summary: c_B0 |
|
644 | |
|
645 o changeset: 1:579f120ba918 |
|
646 | user: test |
|
647 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
648 | summary: c_A0 |
|
649 | |
|
650 o changeset: 0:eba9c2249fe7 |
|
651 user: test |
|
652 date: Thu Jan 01 00:00:00 1970 +0000 |
|
653 summary: c_ROOT |
|
654 |