Mercurial > evolve

comparison tests/test-obsolete.t @ 554:39eb12bb47c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit --amend: adap to core 63e45aee46d4 commit is now able to create obsolete marker itself. We don't alter core if we detect it's the case.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 11 Sep 2012 13:51:24 +0200
parents 7ecd41520dae
children 1c45a07dda51
comparison
equal deleted inserted replaced
553:e29561d918a6 554:39eb12bb47c0
572 $ hg up 'desc(obsol_c)' 572 $ hg up 'desc(obsol_c)'
573 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 573 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
574 $ mkcommit f 574 $ mkcommit f
575 created new head 575 created new head
576 $ echo 42 >> f 576 $ echo 42 >> f
577 $ hg commit --amend --traceback 577 $ hg commit --amend --traceback --quiet
578 saved backup bundle to $TESTTMP/local/.hg/strip-backup/0b1b6dd009c0-amend-backup.hg
579 $ hg glog 578 $ hg glog
580 @ changeset: 13:3734a65252e6 579 @ changeset: 1[35]:3734a65252e6 (re)
581 | tag: tip 580 | tag: tip
582 | parent: 10:2033b4e49474 581 | parent: 10:2033b4e49474
583 | user: test 582 | user: test
584 | date: Thu Jan 01 00:00:00 1970 +0000 583 | date: Thu Jan 01 00:00:00 1970 +0000
585 | summary: add f 584 | summary: add f
615 o changeset: 0:1f0dee641bb7 614 o changeset: 0:1f0dee641bb7
616 user: test 615 user: test
617 date: Thu Jan 01 00:00:00 1970 +0000 616 date: Thu Jan 01 00:00:00 1970 +0000
618 summary: add a 617 summary: add a
619 618
620 $ hg debugobsolete 619 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
621 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob) 620 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
622 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob) 621 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob)
623 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob) 622 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob)
624 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob) 623 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob)
625 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob) 624 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob)
627 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob) 626 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
628 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob) 627 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
629 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob) 628 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
630 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob) 629 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob)
631 0b1b6dd009c037985363e2290a0b579819f659db 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) 630 0b1b6dd009c037985363e2290a0b579819f659db 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
631 #no produced by 2.3
632 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
632 633
633 Check conflict detection 634 Check conflict detection
634 635
635 $ hg up 9468a5f5d8b2 # add obsol_d'' 636 $ hg up 9468a5f5d8b2 # add obsol_d''
636 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 637 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
637 $ mkcommit "obsolet_conflicting_d" 638 $ mkcommit "obsolet_conflicting_d"
638 $ hg summary 639 $ hg summary
639 parent: 14:50f11e5e3a63 tip 640 parent: 1[46]:50f11e5e3a63 tip (re)
640 add obsolet_conflicting_d 641 add obsolet_conflicting_d
641 branch: default 642 branch: default
642 commit: (clean) 643 commit: (clean)
643 update: 9 new changesets, 9 branch heads (merge) 644 update: (9|11) new changesets, (9|10) branch heads \(merge\) (re)
644 latecomer: 1 changesets 645 latecomer: 1 changesets
645 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` 646 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
646 $ hg log -r 'conflicting()' 647 $ hg log -r 'conflicting()'
647 changeset: 14:50f11e5e3a63 648 changeset: 1[46]:50f11e5e3a63 (re)
648 tag: tip 649 tag: tip
649 parent: 11:9468a5f5d8b2 650 parent: 11:9468a5f5d8b2
650 user: test 651 user: test
651 date: Thu Jan 01 00:00:00 1970 +0000 652 date: Thu Jan 01 00:00:00 1970 +0000
652 summary: add obsolet_conflicting_d 653 summary: add obsolet_conflicting_d