equal
deleted
inserted
replaced
125 |
125 |
126 echo '# error on syntax' |
126 echo '# error on syntax' |
127 echo 'x = "f' >> t |
127 echo 'x = "f' >> t |
128 hg log |
128 hg log |
129 |
129 |
|
130 cd .. |
|
131 |
|
132 echo '# latesttag' |
|
133 hg init latesttag |
|
134 cd latesttag |
|
135 |
|
136 echo a > file |
|
137 hg ci -Am a -d '0 0' |
|
138 |
|
139 echo b >> file |
|
140 hg ci -m b -d '1 0' |
|
141 |
|
142 echo c >> head1 |
|
143 hg ci -Am h1c -d '2 0' |
|
144 |
|
145 hg update -q 1 |
|
146 echo d >> head2 |
|
147 hg ci -Am h2d -d '3 0' |
|
148 |
|
149 echo e >> head2 |
|
150 hg ci -m h2e -d '4 0' |
|
151 |
|
152 hg merge -q |
|
153 hg ci -m merge -d '5 0' |
|
154 |
|
155 echo '# No tag set' |
|
156 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
157 |
|
158 echo '# one common tag: longuest path wins' |
|
159 hg tag -r 1 -m t1 -d '6 0' t1 |
|
160 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
161 |
|
162 echo '# one ancestor tag: more recent wins' |
|
163 hg tag -r 2 -m t2 -d '7 0' t2 |
|
164 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
165 |
|
166 echo '# two branch tags: more recent wins' |
|
167 hg tag -r 3 -m t3 -d '8 0' t3 |
|
168 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
169 |
|
170 echo '# merged tag overrides' |
|
171 hg tag -r 5 -m t5 -d '9 0' t5 |
|
172 hg tag -r 3 -m at3 -d '10 0' at3 |
|
173 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n' |
|
174 |
130 echo '# done' |
175 echo '# done' |