Show More
@@ -1056,6 +1056,31 b' Merged tag overrides:' | |||||
1056 | o 0: null+1,1 |
|
1056 | o 0: null+1,1 | |
1057 |
|
1057 | |||
1058 |
|
1058 | |||
|
1059 | Tags of working-directory parents (issue6055): | |||
|
1060 | ||||
|
1061 | $ hg update -q 3 | |||
|
1062 | $ echo a > head3 | |||
|
1063 | $ hg ci -qAm h3a | |||
|
1064 | $ hg merge -q 2 | |||
|
1065 | $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" | |||
|
1066 | hg: parse error: invalid argument for revspec | |||
|
1067 | [255] | |||
|
1068 | ||||
|
1069 | $ hg ci -m merge | |||
|
1070 | $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" | |||
|
1071 | @ 13: at3+2,3 t3+2,3 | |||
|
1072 | |\ | |||
|
1073 | | o 12: at3+1,1 t3+1,1 | |||
|
1074 | | | | |||
|
1075 | | o 3: at3+0,0 t3+0,0 | |||
|
1076 | | | | |||
|
1077 | o | 2: t2+0,0 | |||
|
1078 | |/ | |||
|
1079 | o 1: t1+0,0 | |||
|
1080 | | | |||
|
1081 | o 0: null+1,1 | |||
|
1082 | ||||
|
1083 | ||||
1059 | $ cd .. |
|
1084 | $ cd .. | |
1060 |
|
1085 | |||
1061 | Set up repository containing template fragments in commit metadata: |
|
1086 | Set up repository containing template fragments in commit metadata: |
General Comments 0
You need to be logged in to leave comments.
Login now