equal
deleted
inserted
replaced
1061 $ hg update -q 3 |
1061 $ hg update -q 3 |
1062 $ echo a > head3 |
1062 $ echo a > head3 |
1063 $ hg ci -qAm h3a |
1063 $ hg ci -qAm h3a |
1064 $ hg merge -q 2 |
1064 $ hg merge -q 2 |
1065 $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
1065 $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
1066 hg: parse error: invalid argument for revspec |
1066 o 2147483647: at3+2,3 t3+2,3 |
1067 [255] |
1067 |\ |
|
1068 | @ 12: at3+1,1 t3+1,1 |
|
1069 | | |
|
1070 | o 3: at3+0,0 t3+0,0 |
|
1071 | | |
|
1072 @ | 2: t2+0,0 |
|
1073 |/ |
|
1074 o 1: t1+0,0 |
|
1075 | |
|
1076 o 0: null+1,1 |
|
1077 |
1068 |
1078 |
1069 $ hg ci -m merge |
1079 $ hg ci -m merge |
1070 $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
1080 $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
1071 @ 13: at3+2,3 t3+2,3 |
1081 @ 13: at3+2,3 t3+2,3 |
1072 |\ |
1082 |\ |