Mercurial > evolve
comparison tests/test-obsolete.t @ 3110:50be10c63825 mercurial-4.0
test-compat: merge with mercurial-4.1 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 18:43:55 +0200 |
| parents | ddf28837f5af 3024ae293732 |
| children | 706402d70b3f 088ea9b74e47 |
comparison
equal
deleted
inserted
replaced
| 3109:3024ae293732 | 3110:50be10c63825 |
|---|---|
| 577 changeset: 12:6db5e282cb91 | 577 changeset: 12:6db5e282cb91 |
| 578 tag: tip | 578 tag: tip |
| 579 parent: 10:2033b4e49474 | 579 parent: 10:2033b4e49474 |
| 580 user: test | 580 user: test |
| 581 date: Thu Jan 01 00:00:00 1970 +0000 | 581 date: Thu Jan 01 00:00:00 1970 +0000 |
| 582 trouble: bumped | |
| 583 summary: add obsol_d''' | 582 summary: add obsol_d''' |
| 584 | 583 |
| 585 $ hg push ../other-new/ | 584 $ hg push ../other-new/ |
| 586 pushing to ../other-new/ | 585 pushing to ../other-new/ |
| 587 searching for changes | 586 searching for changes |
| 607 | | 606 | |
| 608 | o changeset: 12:6db5e282cb91 | 607 | o changeset: 12:6db5e282cb91 |
| 609 |/ parent: 10:2033b4e49474 | 608 |/ parent: 10:2033b4e49474 |
| 610 | user: test | 609 | user: test |
| 611 | date: Thu Jan 01 00:00:00 1970 +0000 | 610 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 612 | trouble: bumped | |
| 613 | summary: add obsol_d''' | 611 | summary: add obsol_d''' |
| 614 | | 612 | |
| 615 | o changeset: 11:9468a5f5d8b2 | 613 | o changeset: 11:9468a5f5d8b2 |
| 616 |/ user: test | 614 |/ user: test |
| 617 | date: Thu Jan 01 00:00:00 1970 +0000 | 615 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 671 $ hg log -r 'contentdivergent()' | 669 $ hg log -r 'contentdivergent()' |
| 672 changeset: 12:6db5e282cb91 | 670 changeset: 12:6db5e282cb91 |
| 673 parent: 10:2033b4e49474 | 671 parent: 10:2033b4e49474 |
| 674 user: test | 672 user: test |
| 675 date: Thu Jan 01 00:00:00 1970 +0000 | 673 date: Thu Jan 01 00:00:00 1970 +0000 |
| 676 trouble: bumped, divergent | |
| 677 summary: add obsol_d''' | 674 summary: add obsol_d''' |
| 678 | 675 |
| 679 changeset: 16:50f11e5e3a63 | 676 changeset: 16:50f11e5e3a63 |
| 680 tag: tip | 677 tag: tip |
| 681 parent: 11:9468a5f5d8b2 | 678 parent: 11:9468a5f5d8b2 |
| 682 user: test | 679 user: test |
| 683 date: Thu Jan 01 00:00:00 1970 +0000 | 680 date: Thu Jan 01 00:00:00 1970 +0000 |
| 684 trouble: divergent | |
| 685 summary: add obsolet_conflicting_d | 681 summary: add obsolet_conflicting_d |
| 686 | 682 |
| 687 | 683 |
| 688 $ hg up --hidden 3 -q | 684 $ hg up --hidden 3 -q |
| 689 working directory parent is obsolete! (0d3f46688ccc) | 685 working directory parent is obsolete! (0d3f46688ccc) |
| 719 @ changeset: 17:a5f7a21fe7bc | 715 @ changeset: 17:a5f7a21fe7bc |
| 720 | tag: tip | 716 | tag: tip |
| 721 | parent: 2:4538525df7e2 | 717 | parent: 2:4538525df7e2 |
| 722 | user: test | 718 | user: test |
| 723 | date: Thu Jan 01 00:00:00 1970 +0000 | 719 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 724 | trouble: unstable | |
| 725 | summary: add obsol_d'' | 720 | summary: add obsol_d'' |
| 726 | | 721 | |
| 727 | o changeset: 16:50f11e5e3a63 | 722 | o changeset: 16:50f11e5e3a63 |
| 728 | | parent: 11:9468a5f5d8b2 | 723 | | parent: 11:9468a5f5d8b2 |
| 729 | | user: test | 724 | | user: test |
| 730 | | date: Thu Jan 01 00:00:00 1970 +0000 | 725 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 731 | | trouble: divergent | |
| 732 | | summary: add obsolet_conflicting_d | 726 | | summary: add obsolet_conflicting_d |
| 733 | | | 727 | | |
| 734 | | o changeset: 15:705ab2a6b72e | 728 | | o changeset: 15:705ab2a6b72e |
| 735 | | | parent: 10:2033b4e49474 | 729 | | | parent: 10:2033b4e49474 |
| 736 | | | user: test | 730 | | | user: test |
| 750 | | | | 744 | | | |
| 751 | | | o changeset: 12:6db5e282cb91 | 745 | | | o changeset: 12:6db5e282cb91 |
| 752 | | |/ parent: 10:2033b4e49474 | 746 | | |/ parent: 10:2033b4e49474 |
| 753 | | | user: test | 747 | | | user: test |
| 754 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 748 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 755 | | | trouble: bumped, divergent | |
| 756 | | | summary: add obsol_d''' | 749 | | | summary: add obsol_d''' |
| 757 | | | | 750 | | | |
| 758 | o | changeset: 11:9468a5f5d8b2 | 751 | o | changeset: 11:9468a5f5d8b2 |
| 759 | |/ user: test | 752 | |/ user: test |
| 760 | | date: Thu Jan 01 00:00:00 1970 +0000 | 753 | | date: Thu Jan 01 00:00:00 1970 +0000 |