Mercurial > evolve
comparison tests/test-topic.t @ 3108:9c9c8c1eeb93 mercurial-4.2
test-compat: merge with mercurial-4.3 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 18:34:22 +0200 |
| parents | ccfcacc5ee7c 67b59d1657cf |
| children | ddbb4d069203 |
comparison
equal
deleted
inserted
replaced
| 3107:1f61525727bf | 3108:9c9c8c1eeb93 |
|---|---|
| 651 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads | 651 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads |
| 652 t1: start on fran | 652 t1: start on fran |
| 653 t0^ Add file delta (base current) | 653 t0^ Add file delta (base current) |
| 654 | 654 |
| 655 $ hg topics --age | 655 $ hg topics --age |
| 656 * fran (1970-01-01 by test) | 656 * fran (* by test) (glob) |
| 657 | 657 |
| 658 $ cd .. | 658 $ cd .. |
| 659 | 659 |
| 660 Testing the new config knob to forbid untopiced commit | 660 Testing the new config knob to forbid untopiced commit |
| 661 ====================================================== | 661 ====================================================== |
| 699 switching to topic topic1970 | 699 switching to topic topic1970 |
| 700 changed topic on 1 changes | 700 changed topic on 1 changes |
| 701 | 701 |
| 702 $ hg add b | 702 $ hg add b |
| 703 $ hg topic topic1990 | 703 $ hg topic topic1990 |
| 704 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" | 704 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" --date "631152000 0" |
| 705 active topic 'topic1990' grew its first changeset | 705 active topic 'topic1990' grew its first changeset |
| 706 $ hg add c | 706 $ hg add c |
| 707 $ hg topic topic2010 | 707 $ hg topic topic2010 |
| 708 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" | 708 $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" --date "1262304000 0" |
| 709 active topic 'topic2010' grew its first changeset | 709 active topic 'topic2010' grew its first changeset |
| 710 | 710 |
| 711 $ hg log -G | 711 $ hg log -G |
| 712 @ changeset: 3:76b16af75125 | 712 @ changeset: 3:76b16af75125 |
| 713 | tag: tip | 713 | tag: tip |
| 733 topic1970 (1 changesets) | 733 topic1970 (1 changesets) |
| 734 topic1990 (1 changesets) | 734 topic1990 (1 changesets) |
| 735 * topic2010 (1 changesets) | 735 * topic2010 (1 changesets) |
| 736 | 736 |
| 737 $ hg topics --age | 737 $ hg topics --age |
| 738 * topic2010 (2010-01-01 by bar) | 738 topic1970 (* by test) (glob) |
| 739 topic1990 (1990-01-01 by foo) | 739 * topic2010 (* by bar) (glob) |
| 740 topic1970 (1970-01-01 by test) | 740 topic1990 (* by foo) (glob) |
| 741 | 741 |
| 742 $ hg up topic1970 | 742 $ hg up topic1970 |
| 743 switching to topic topic1970 | 743 switching to topic topic1970 |
| 744 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 744 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 745 | 745 |
| 746 $ hg topics --age | 746 $ hg topics --age |
| 747 topic2010 (2010-01-01 by bar) | 747 * topic1970 (* by test) (glob) |
| 748 topic1990 (1990-01-01 by foo) | 748 topic2010 (* by bar) (glob) |
| 749 * topic1970 (1970-01-01 by test) | 749 topic1990 (* by foo) (glob) |
| 750 | 750 |
| 751 $ hg topics --age random | 751 $ hg topics --age random |
| 752 abort: cannot use --age while setting a topic | 752 abort: cannot use --age while setting a topic |
| 753 [255] | 753 [255] |
| 754 $ cd .. | 754 $ cd .. |