Mercurial > evolve
comparison tests/test-obsolete.t @ 2833:08a64770ed24
log: trouble was renamed into instability
Trouble was renamed into instability, update tests.
Match 6f4bc9688ca9 mercurial changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 10 Aug 2017 17:31:23 +0200 |
| parents | 07b9fcf8b6d3 |
| children | 38db1466c6fb |
comparison
equal
deleted
inserted
replaced
| 2832:07b9fcf8b6d3 | 2833:08a64770ed24 |
|---|---|
| 590 changeset: 12:6db5e282cb91 | 590 changeset: 12:6db5e282cb91 |
| 591 tag: tip | 591 tag: tip |
| 592 parent: 10:2033b4e49474 | 592 parent: 10:2033b4e49474 |
| 593 user: test | 593 user: test |
| 594 date: Thu Jan 01 00:00:00 1970 +0000 | 594 date: Thu Jan 01 00:00:00 1970 +0000 |
| 595 trouble: bumped | 595 instability: bumped |
| 596 summary: add obsol_d''' | 596 summary: add obsol_d''' |
| 597 | 597 |
| 598 $ hg push ../other-new/ | 598 $ hg push ../other-new/ |
| 599 pushing to ../other-new/ | 599 pushing to ../other-new/ |
| 600 searching for changes | 600 searching for changes |
| 620 | | 620 | |
| 621 | o changeset: 12:6db5e282cb91 | 621 | o changeset: 12:6db5e282cb91 |
| 622 |/ parent: 10:2033b4e49474 | 622 |/ parent: 10:2033b4e49474 |
| 623 | user: test | 623 | user: test |
| 624 | date: Thu Jan 01 00:00:00 1970 +0000 | 624 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 625 | trouble: bumped | 625 | instability: bumped |
| 626 | summary: add obsol_d''' | 626 | summary: add obsol_d''' |
| 627 | | 627 | |
| 628 | o changeset: 11:9468a5f5d8b2 | 628 | o changeset: 11:9468a5f5d8b2 |
| 629 |/ user: test | 629 |/ user: test |
| 630 | date: Thu Jan 01 00:00:00 1970 +0000 | 630 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 684 $ hg log -r 'divergent()' | 684 $ hg log -r 'divergent()' |
| 685 changeset: 12:6db5e282cb91 | 685 changeset: 12:6db5e282cb91 |
| 686 parent: 10:2033b4e49474 | 686 parent: 10:2033b4e49474 |
| 687 user: test | 687 user: test |
| 688 date: Thu Jan 01 00:00:00 1970 +0000 | 688 date: Thu Jan 01 00:00:00 1970 +0000 |
| 689 trouble: bumped, divergent | 689 instability: bumped, divergent |
| 690 summary: add obsol_d''' | 690 summary: add obsol_d''' |
| 691 | 691 |
| 692 changeset: 16:50f11e5e3a63 | 692 changeset: 16:50f11e5e3a63 |
| 693 tag: tip | 693 tag: tip |
| 694 parent: 11:9468a5f5d8b2 | 694 parent: 11:9468a5f5d8b2 |
| 695 user: test | 695 user: test |
| 696 date: Thu Jan 01 00:00:00 1970 +0000 | 696 date: Thu Jan 01 00:00:00 1970 +0000 |
| 697 trouble: divergent | 697 instability: divergent |
| 698 summary: add obsolet_conflicting_d | 698 summary: add obsolet_conflicting_d |
| 699 | 699 |
| 700 | 700 |
| 701 $ hg up --hidden 3 -q | 701 $ hg up --hidden 3 -q |
| 702 working directory parent is obsolete! (0d3f46688ccc) | 702 working directory parent is obsolete! (0d3f46688ccc) |
| 732 @ changeset: 17:a5f7a21fe7bc | 732 @ changeset: 17:a5f7a21fe7bc |
| 733 | tag: tip | 733 | tag: tip |
| 734 | parent: 2:4538525df7e2 | 734 | parent: 2:4538525df7e2 |
| 735 | user: test | 735 | user: test |
| 736 | date: Thu Jan 01 00:00:00 1970 +0000 | 736 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 737 | trouble: unstable | 737 | instability: unstable |
| 738 | summary: add obsol_d'' | 738 | summary: add obsol_d'' |
| 739 | | 739 | |
| 740 | o changeset: 16:50f11e5e3a63 | 740 | o changeset: 16:50f11e5e3a63 |
| 741 | | parent: 11:9468a5f5d8b2 | 741 | | parent: 11:9468a5f5d8b2 |
| 742 | | user: test | 742 | | user: test |
| 743 | | date: Thu Jan 01 00:00:00 1970 +0000 | 743 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 744 | | trouble: divergent | 744 | | instability: divergent |
| 745 | | summary: add obsolet_conflicting_d | 745 | | summary: add obsolet_conflicting_d |
| 746 | | | 746 | | |
| 747 | | o changeset: 15:705ab2a6b72e | 747 | | o changeset: 15:705ab2a6b72e |
| 748 | | | parent: 10:2033b4e49474 | 748 | | | parent: 10:2033b4e49474 |
| 749 | | | user: test | 749 | | | user: test |
| 765 | | | | 765 | | | |
| 766 | | | o changeset: 12:6db5e282cb91 | 766 | | | o changeset: 12:6db5e282cb91 |
| 767 | | |/ parent: 10:2033b4e49474 | 767 | | |/ parent: 10:2033b4e49474 |
| 768 | | | user: test | 768 | | | user: test |
| 769 | | | date: Thu Jan 01 00:00:00 1970 +0000 | 769 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 770 | | | trouble: bumped, divergent | 770 | | | instability: bumped, divergent |
| 771 | | | summary: add obsol_d''' | 771 | | | summary: add obsol_d''' |
| 772 | | | | 772 | | | |
| 773 | o | changeset: 11:9468a5f5d8b2 | 773 | o | changeset: 11:9468a5f5d8b2 |
| 774 | |/ user: test | 774 | |/ user: test |
| 775 | | date: Thu Jan 01 00:00:00 1970 +0000 | 775 | | date: Thu Jan 01 00:00:00 1970 +0000 |