2869 $ hg merge -q |
2869 $ hg merge -q |
2870 $ hg ci -m merge -d '5 -3600' |
2870 $ hg ci -m merge -d '5 -3600' |
2871 |
2871 |
2872 No tag set: |
2872 No tag set: |
2873 |
2873 |
2874 $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2874 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2875 5: null+5 |
2875 @ 5: null+5 |
2876 4: null+4 |
2876 |\ |
2877 3: null+3 |
2877 | o 4: null+4 |
2878 2: null+3 |
2878 | | |
2879 1: null+2 |
2879 | o 3: null+3 |
2880 0: null+1 |
2880 | | |
|
2881 o | 2: null+3 |
|
2882 |/ |
|
2883 o 1: null+2 |
|
2884 | |
|
2885 o 0: null+1 |
|
2886 |
2881 |
2887 |
2882 One common tag: longest path wins: |
2888 One common tag: longest path wins: |
2883 |
2889 |
2884 $ hg tag -r 1 -m t1 -d '6 0' t1 |
2890 $ hg tag -r 1 -m t1 -d '6 0' t1 |
2885 $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2891 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2886 6: t1+4 |
2892 @ 6: t1+4 |
2887 5: t1+3 |
2893 | |
2888 4: t1+2 |
2894 o 5: t1+3 |
2889 3: t1+1 |
2895 |\ |
2890 2: t1+1 |
2896 | o 4: t1+2 |
2891 1: t1+0 |
2897 | | |
2892 0: null+1 |
2898 | o 3: t1+1 |
|
2899 | | |
|
2900 o | 2: t1+1 |
|
2901 |/ |
|
2902 o 1: t1+0 |
|
2903 | |
|
2904 o 0: null+1 |
|
2905 |
2893 |
2906 |
2894 One ancestor tag: more recent wins: |
2907 One ancestor tag: more recent wins: |
2895 |
2908 |
2896 $ hg tag -r 2 -m t2 -d '7 0' t2 |
2909 $ hg tag -r 2 -m t2 -d '7 0' t2 |
2897 $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2910 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2898 7: t2+3 |
2911 @ 7: t2+3 |
2899 6: t2+2 |
2912 | |
2900 5: t2+1 |
2913 o 6: t2+2 |
2901 4: t1+2 |
2914 | |
2902 3: t1+1 |
2915 o 5: t2+1 |
2903 2: t2+0 |
2916 |\ |
2904 1: t1+0 |
2917 | o 4: t1+2 |
2905 0: null+1 |
2918 | | |
|
2919 | o 3: t1+1 |
|
2920 | | |
|
2921 o | 2: t2+0 |
|
2922 |/ |
|
2923 o 1: t1+0 |
|
2924 | |
|
2925 o 0: null+1 |
|
2926 |
2906 |
2927 |
2907 Two branch tags: more recent wins: |
2928 Two branch tags: more recent wins: |
2908 |
2929 |
2909 $ hg tag -r 3 -m t3 -d '8 0' t3 |
2930 $ hg tag -r 3 -m t3 -d '8 0' t3 |
2910 $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2931 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2911 8: t3+5 |
2932 @ 8: t3+5 |
2912 7: t3+4 |
2933 | |
2913 6: t3+3 |
2934 o 7: t3+4 |
2914 5: t3+2 |
2935 | |
2915 4: t3+1 |
2936 o 6: t3+3 |
2916 3: t3+0 |
2937 | |
2917 2: t2+0 |
2938 o 5: t3+2 |
2918 1: t1+0 |
2939 |\ |
2919 0: null+1 |
2940 | o 4: t3+1 |
|
2941 | | |
|
2942 | o 3: t3+0 |
|
2943 | | |
|
2944 o | 2: t2+0 |
|
2945 |/ |
|
2946 o 1: t1+0 |
|
2947 | |
|
2948 o 0: null+1 |
|
2949 |
2920 |
2950 |
2921 Merged tag overrides: |
2951 Merged tag overrides: |
2922 |
2952 |
2923 $ hg tag -r 5 -m t5 -d '9 0' t5 |
2953 $ hg tag -r 5 -m t5 -d '9 0' t5 |
2924 $ hg tag -r 3 -m at3 -d '10 0' at3 |
2954 $ hg tag -r 3 -m at3 -d '10 0' at3 |
2925 $ hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2955 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2926 10: t5+5 |
2956 @ 10: t5+5 |
2927 9: t5+4 |
2957 | |
2928 8: t5+3 |
2958 o 9: t5+4 |
2929 7: t5+2 |
2959 | |
2930 6: t5+1 |
2960 o 8: t5+3 |
2931 5: t5+0 |
2961 | |
2932 4: at3:t3+1 |
2962 o 7: t5+2 |
2933 3: at3:t3+0 |
2963 | |
2934 2: t2+0 |
2964 o 6: t5+1 |
2935 1: t1+0 |
2965 | |
2936 0: null+1 |
2966 o 5: t5+0 |
2937 |
2967 |\ |
2938 $ hg log --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
2968 | o 4: at3:t3+1 |
2939 10: t5+5,5 |
2969 | | |
2940 9: t5+4,4 |
2970 | o 3: at3:t3+0 |
2941 8: t5+3,3 |
2971 | | |
2942 7: t5+2,2 |
2972 o | 2: t2+0 |
2943 6: t5+1,1 |
2973 |/ |
2944 5: t5+0,0 |
2974 o 1: t1+0 |
2945 4: at3+1,1 t3+1,1 |
2975 | |
2946 3: at3+0,0 t3+0,0 |
2976 o 0: null+1 |
2947 2: t2+0,0 |
2977 |
2948 1: t1+0,0 |
2978 |
2949 0: null+1,1 |
2979 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
2950 |
2980 @ 10: t5+5,5 |
2951 $ hg log --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
2981 | |
2952 10: t3, C: 8, D: 7 |
2982 o 9: t5+4,4 |
2953 9: t3, C: 7, D: 6 |
2983 | |
2954 8: t3, C: 6, D: 5 |
2984 o 8: t5+3,3 |
2955 7: t3, C: 5, D: 4 |
2985 | |
2956 6: t3, C: 4, D: 3 |
2986 o 7: t5+2,2 |
2957 5: t3, C: 3, D: 2 |
2987 | |
2958 4: t3, C: 1, D: 1 |
2988 o 6: t5+1,1 |
2959 3: t3, C: 0, D: 0 |
2989 | |
2960 2: t1, C: 1, D: 1 |
2990 o 5: t5+0,0 |
2961 1: t1, C: 0, D: 0 |
2991 |\ |
2962 0: null, C: 1, D: 1 |
2992 | o 4: at3+1,1 t3+1,1 |
|
2993 | | |
|
2994 | o 3: at3+0,0 t3+0,0 |
|
2995 | | |
|
2996 o | 2: t2+0,0 |
|
2997 |/ |
|
2998 o 1: t1+0,0 |
|
2999 | |
|
3000 o 0: null+1,1 |
|
3001 |
|
3002 |
|
3003 $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
|
3004 @ 10: t3, C: 8, D: 7 |
|
3005 | |
|
3006 o 9: t3, C: 7, D: 6 |
|
3007 | |
|
3008 o 8: t3, C: 6, D: 5 |
|
3009 | |
|
3010 o 7: t3, C: 5, D: 4 |
|
3011 | |
|
3012 o 6: t3, C: 4, D: 3 |
|
3013 | |
|
3014 o 5: t3, C: 3, D: 2 |
|
3015 |\ |
|
3016 | o 4: t3, C: 1, D: 1 |
|
3017 | | |
|
3018 | o 3: t3, C: 0, D: 0 |
|
3019 | | |
|
3020 o | 2: t1, C: 1, D: 1 |
|
3021 |/ |
|
3022 o 1: t1, C: 0, D: 0 |
|
3023 | |
|
3024 o 0: null, C: 1, D: 1 |
|
3025 |
2963 |
3026 |
2964 $ cd .. |
3027 $ cd .. |
2965 |
3028 |
2966 |
3029 |
2967 Style path expansion: issue1948 - ui.style option doesn't work on OSX |
3030 Style path expansion: issue1948 - ui.style option doesn't work on OSX |