Mercurial > evolve
comparison tests/test-obsolete.t @ 2318:523855eb28c1 mercurial-4.0
merge with future 6.1.0
In addition to the output reverted for 4.1, we also drop the "troubles:" entry
from the standard log.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 03 May 2017 13:18:08 +0200 |
| parents | 90ab79764ce4 61d073590fb7 |
| children | 979a8ea17e1e 765b2561fa90 |
comparison
equal
deleted
inserted
replaced
| 2317:7263463ae79a | 2318:523855eb28c1 |
|---|---|
| 578 changeset: 12:6db5e282cb91 | 578 changeset: 12:6db5e282cb91 |
| 579 tag: tip | 579 tag: tip |
| 580 parent: 10:2033b4e49474 | 580 parent: 10:2033b4e49474 |
| 581 user: test | 581 user: test |
| 582 date: Thu Jan 01 00:00:00 1970 +0000 | 582 date: Thu Jan 01 00:00:00 1970 +0000 |
| 583 trouble: bumped | |
| 584 summary: add obsol_d''' | 583 summary: add obsol_d''' |
| 585 | 584 |
| 586 $ hg push ../other-new/ | 585 $ hg push ../other-new/ |
| 587 pushing to ../other-new/ | 586 pushing to ../other-new/ |
| 588 searching for changes | 587 searching for changes |
| 608 | | 607 | |
| 609 | o changeset: 12:6db5e282cb91 | 608 | o changeset: 12:6db5e282cb91 |
| 610 |/ parent: 10:2033b4e49474 | 609 |/ parent: 10:2033b4e49474 |
| 611 | user: test | 610 | user: test |
| 612 | date: Thu Jan 01 00:00:00 1970 +0000 | 611 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 613 | trouble: bumped | |
| 614 | summary: add obsol_d''' | 612 | summary: add obsol_d''' |
| 615 | | 613 | |
| 616 | o changeset: 11:9468a5f5d8b2 | 614 | o changeset: 11:9468a5f5d8b2 |
| 617 |/ user: test | 615 |/ user: test |
| 618 | date: Thu Jan 01 00:00:00 1970 +0000 | 616 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 672 $ hg log -r 'divergent()' | 670 $ hg log -r 'divergent()' |
| 673 changeset: 12:6db5e282cb91 | 671 changeset: 12:6db5e282cb91 |
| 674 parent: 10:2033b4e49474 | 672 parent: 10:2033b4e49474 |
| 675 user: test | 673 user: test |
| 676 date: Thu Jan 01 00:00:00 1970 +0000 | 674 date: Thu Jan 01 00:00:00 1970 +0000 |
| 677 trouble: bumped, divergent | |
| 678 summary: add obsol_d''' | 675 summary: add obsol_d''' |
| 679 | 676 |
| 680 changeset: 16:50f11e5e3a63 | 677 changeset: 16:50f11e5e3a63 |
| 681 tag: tip | 678 tag: tip |
| 682 parent: 11:9468a5f5d8b2 | 679 parent: 11:9468a5f5d8b2 |
| 683 user: test | 680 user: test |
| 684 date: Thu Jan 01 00:00:00 1970 +0000 | 681 date: Thu Jan 01 00:00:00 1970 +0000 |
| 685 trouble: divergent | |
| 686 summary: add obsolet_conflicting_d | 682 summary: add obsolet_conflicting_d |
| 687 | 683 |
| 688 | 684 |
| 689 $ hg up --hidden 3 -q | 685 $ hg up --hidden 3 -q |
| 690 working directory parent is obsolete! (0d3f46688ccc) | 686 working directory parent is obsolete! (0d3f46688ccc) |
| 718 @ changeset: 17:a5f7a21fe7bc | 714 @ changeset: 17:a5f7a21fe7bc |
| 719 | tag: tip | 715 | tag: tip |
| 720 | parent: 2:4538525df7e2 | 716 | parent: 2:4538525df7e2 |
| 721 | user: test | 717 | user: test |
| 722 | date: Thu Jan 01 00:00:00 1970 +0000 | 718 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 723 | trouble: unstable | |
| 724 | summary: add obsol_d'' | 719 | summary: add obsol_d'' |
| 725 | | 720 | |
| 726 | o changeset: 16:50f11e5e3a63 | 721 | o changeset: 16:50f11e5e3a63 |
| 727 | | parent: 11:9468a5f5d8b2 | 722 | | parent: 11:9468a5f5d8b2 |
| 728 | | user: test | 723 | | user: test |
| 729 | | date: Thu Jan 01 00:00:00 1970 +0000 | 724 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 730 | | trouble: divergent | |
| 731 | | summary: add obsolet_conflicting_d | 725 | | summary: add obsolet_conflicting_d |
| 732 | | | 726 | | |
| 733 | | o changeset: 15:705ab2a6b72e | 727 | | o changeset: 15:705ab2a6b72e |
| 734 | | | parent: 10:2033b4e49474 | 728 | | | parent: 10:2033b4e49474 |
| 735 | | | user: test | 729 | | | user: test |
| 749 | | | | 743 | | | |
| 750 | | | o changeset: 12:6db5e282cb91 | 744 | | | o changeset: 12:6db5e282cb91 |
| 751 | | |/ parent: 10:2033b4e49474 | 745 | | |/ parent: 10:2033b4e49474 |
| 752 | | | user: test | 746 | | | user: test |
| 753 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 747 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 754 | | | trouble: bumped, divergent | |
| 755 | | | summary: add obsol_d''' | 748 | | | summary: add obsol_d''' |
| 756 | | | | 749 | | | |
| 757 | o | changeset: 11:9468a5f5d8b2 | 750 | o | changeset: 11:9468a5f5d8b2 |
| 758 | |/ user: test | 751 | |/ user: test |
| 759 | | date: Thu Jan 01 00:00:00 1970 +0000 | 752 | | date: Thu Jan 01 00:00:00 1970 +0000 |