Mercurial > evolve

comparison tests/test-topic.t @ 4356:a71f2271ed76 mercurial-4.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with future version
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 10:46:02 -0500
parents 0f015fe4f71f
children 2cbb9914d227 d3cc1b55ad0a
comparison
equal deleted inserted replaced
4355:75db6a9d0b54 4356:a71f2271ed76
817 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads 817 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads
818 s1: start on fran 818 s1: start on fran
819 s0^ Add file delta (base current) 819 s0^ Add file delta (base current)
820 820
821 $ hg topics --age 821 $ hg topics --age
822 * fran (1970-01-01 by test) 822 * fran (1970-01-01 by test, 1 changesets)
823
824 $ cd ..
825
826 Relation subscript in revsets
827 =============================
828
829 $ hg init more-than-one-commit-per-topic
830 $ cd more-than-one-commit-per-topic
831 $ cat > .hg/hgrc << EOF
832 > [phases]
833 > publish=false
834 > EOF
835
836 $ echo 0 > foo
837 $ hg ci -qAm 0
838 $ hg topic featureA
839 marked working directory as topic: featureA
840 $ echo 1 > foo
841 $ hg ci -qm 1
842 $ echo 2 > foo
843 $ hg ci -qm 2
844 $ echo 3 > foo
845 $ hg ci -qm 3
846 $ hg topic --clear
847 $ echo 4 > foo
848 $ hg ci -qm 4
849
850 $ tlog 'all()'
851 0:
852 1: featureA
853 2: featureA
854 3: featureA
855 4:
823 856
824 $ cd .. 857 $ cd ..
825 858
826 Testing the new config knob to forbid untopiced commit 859 Testing the new config knob to forbid untopiced commit
827 ====================================================== 860 ======================================================
861 Testing the --age flag for `hg topics` 894 Testing the --age flag for `hg topics`
862 ====================================== 895 ======================================
863 896
864 $ hg topic topic1970 --rev 0 897 $ hg topic topic1970 --rev 0
865 switching to topic topic1970 898 switching to topic topic1970
866 changed topic on 1 changes 899 changed topic on 1 changesets to "topic1970"
867 900
868 $ hg add b 901 $ hg add b
869 $ hg topic topic1990 902 $ hg topic topic1990
870 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" 903 $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo"
871 active topic 'topic1990' grew its first changeset 904 active topic 'topic1990' grew its first changeset
901 topic1970 (1 changesets) 934 topic1970 (1 changesets)
902 topic1990 (1 changesets) 935 topic1990 (1 changesets)
903 * topic2010 (1 changesets) 936 * topic2010 (1 changesets)
904 937
905 $ hg topics --age 938 $ hg topics --age
906 * topic2010 (2010-01-01 by bar) 939 * topic2010 (2010-01-01 by bar, 1 changesets)
907 topic1990 (1990-01-01 by foo) 940 topic1990 (1990-01-01 by foo, 1 changesets)
908 topic1970 (1970-01-01 by test) 941 topic1970 (1970-01-01 by test, 1 changesets)
942
943 $ hg topics --age --verbose
944 * topic2010 (2010-01-01 by bar, on branch: default, 1 changesets)
945 topic1990 (1990-01-01 by foo, on branch: default, 1 changesets)
946 topic1970 (1970-01-01 by test, on branch: default, 1 changesets)
909 947
910 $ hg up topic1970 948 $ hg up topic1970
911 switching to topic topic1970 949 switching to topic topic1970
912 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 950 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
913 951
914 $ hg topics --age 952 $ hg topics --age
915 topic2010 (2010-01-01 by bar) 953 topic2010 (2010-01-01 by bar, 1 changesets)
916 topic1990 (1990-01-01 by foo) 954 topic1990 (1990-01-01 by foo, 1 changesets)
917 * topic1970 (1970-01-01 by test) 955 * topic1970 (1970-01-01 by test, 1 changesets)
918 956
919 $ hg topics --age random 957 $ hg topics --age random
920 abort: cannot use --age while setting a topic 958 abort: cannot use --age while setting a topic
921 [255] 959 [255]
922 $ cd .. 960 $ cd ..