Mercurial > evolve

comparison tests/test-rewind.t @ 3866:de42d00d6ee2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewind: use rewinded parent when creating multiple changesets Use use the rewinded parent instead of creating orphans based on identical, but obsolete, changesets.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 17 Jun 2018 02:03:03 +0200
parents b945f2dae587
children 339b05c3e929
comparison
equal deleted inserted replaced
3865:b945f2dae587 3866:de42d00d6ee2
575 setup 575 setup
576 ````` 576 `````
577 577
578 $ echo 'default-date = 3 0' >> $HGRCPATH 578 $ echo 'default-date = 3 0' >> $HGRCPATH
579 579
580 note: the orphan creation is unfortunate, and should be fixed later.
581
582 Actual Rewind 580 Actual Rewind
583 ````````````` 581 `````````````
584 582
585 $ hg rewind --to '9576e80d6851+a0316c4c5417' --hidden 583 $ hg rewind --to '9576e80d6851+a0316c4c5417' --hidden
586 1 new orphan changesets
587 rewinded to 2 changesets 584 rewinded to 2 changesets
588 (1 changesets obsoleted) 585 (1 changesets obsoleted)
589 working directory is now at d3bb9de71a17 586 working directory is now at 85be7b94f69e
590 $ hg debugobsolete 587 $ hg debugobsolete
591 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'} 588 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'} 589 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'} 590 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'} 591 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'} 592 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'} 593 9576e80d6851ce79cd535e2dc5fa01b444d89a39 85be7b94f69e936d6f0fc52118211da82fe4e838 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
594 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 85be7b94f69e936d6f0fc52118211da82fe4e838 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '46', 'operation': 'rewind', 'user': 'test'}
598 $ hg obslog -r -2: 595 $ hg obslog -r -2:
599 o 73a1ac2e570d (8) c_CD0 596 o 73a1ac2e570d (7) c_CD0
600 |\ 597 |\
601 +---@ d3bb9de71a17 (7) c_CD0 598 +---@ 85be7b94f69e (8) c_CD0
602 | | | 599 | | |
603 x---+ 4535d0af405c (6) c_CD0 600 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) 601 |\| | rewritten(meta, date, parent, content) as 73a1ac2e570d, 85be7b94f69e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
605 | | | 602 | | |
606 +---x 9576e80d6851 (5) c_CD0 603 +---x 9576e80d6851 (5) c_CD0
607 | | rewritten(meta, parent, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) 604 | | 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) 605 | | rewritten(meta, date, parent) as 85be7b94f69e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
609 | | 606 | |
610 | x a0316c4c5417 (4) c_CD0 607 | x a0316c4c5417 (4) c_CD0
611 |/ rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) 608 |/ 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) 609 | rewritten(meta, date) as 73a1ac2e570d using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
613 | 610 |
614 x 49fb7d900906 (3) c_CD0 611 x 49fb7d900906 (3) c_CD0
615 rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000) 612 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) 613 rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
617 614
618 $ hg log -G 615 $ hg log -G
619 o changeset: 8:73a1ac2e570d 616 @ changeset: 8:85be7b94f69e
620 | tag: tip 617 | tag: tip
621 | parent: 2:7e594302a05d
622 | user: test 618 | user: test
623 | date: Thu Jan 01 00:00:03 1970 +0000 619 | date: Thu Jan 01 00:00:03 1970 +0000
624 | summary: c_CD0 620 | summary: c_CD0
625 | 621 |
626 | @ changeset: 7:d3bb9de71a17 622 o changeset: 7:73a1ac2e570d
627 | | parent: 4:a0316c4c5417 623 | parent: 2:7e594302a05d
628 | | user: test 624 | user: test
629 | | date: Thu Jan 01 00:00:03 1970 +0000 625 | date: Thu Jan 01 00:00:03 1970 +0000
630 | | instability: orphan 626 | summary: c_CD0
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 | 627 |
640 o changeset: 2:7e594302a05d 628 o changeset: 2:7e594302a05d
641 | user: test 629 | user: test
642 | date: Thu Jan 01 00:00:00 1970 +0000 630 | date: Thu Jan 01 00:00:00 1970 +0000
643 | summary: c_B0 631 | summary: c_B0