Mercurial > hg
changeset 19649:73513cb8c379
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 03 Sep 2013 18:08:27 -0500 |
| parents | 4b83bcc1f965 (current diff) e90c37d7d48c (diff) |
| children | 5e1083447f7f |
| files | |
| diffstat | 4 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Tue Sep 03 15:50:59 2013 -0500 +++ b/.hgsigs Tue Sep 03 18:08:27 2013 -0500 @@ -76,3 +76,4 @@ 009794acc6e37a650f0fae37872e733382ac1c0c 0 iD8DBQBR0guxywK+sNU5EO8RArNkAKCq9pMihVzP8Os5kCmgbWpe5C37wgCgqzuPZTHvAsXF5wTyaSTMVa9Ccq4= f0d7721d7322dcfb5af33599c2543f27335334bb 0 iD8DBQBR8taaywK+sNU5EO8RAqeEAJ4idDhhDuEsgsUjeQgWNj498matHACfT67gSF5w0ylsrBx1Hb52HkGXDm0= f37b5a17e6a0ee17afde2cdde5393dd74715fb58 0 iD8DBQBR+ymFywK+sNU5EO8RAuSdAJkBMcd9DAZ3rWE9WGKPm2YZ8LBoXACfXn/wbEsVy7ZgJoUwiWmHSnQaWCI= +335a558f81dc73afeab4d7be63617392b130117f 0 iQIVAwUAUiZrIyBXgaxoKi1yAQK2iw//cquNqqSkc8Re5/TZT9I6NH+lh6DbOKjJP0Xl1Wqq0K+KSIUgZG4G32ovaEb2l5X0uY+3unRPiZ0ebl0YSw4Fb2ZiPIADXLBTOYRrY2Wwd3tpJeGI6wEgZt3SfcITV/g7NJrCjT3FlYoSOIayrExM80InSdcEM0Q3Rx6HKzY2acyxzgZeAtAW5ohFvHilSvY6p5Gcm4+QptMxvw45GPdreUmjeXZxNXNXZ8P+MjMz/QJbai/N7PjmK8lqnhkBsT48Ng/KhhmOkGntNJ2/ImBWLFGcWngSvJ7sfWwnyhndvGhe0Hq1NcCf7I8TjNDxU5TR+m+uW7xjXdLoDbUjBdX4sKXnh8ZjbYiODKBOrrDq25cf8nA/tnpKyE/qsVy60kOk6loY4XKiYmn1V49Ta0emmDx0hqo3HgxHHsHX0NDnGdWGol7cPRET0RzVobKq1A0jnrhPooWidvLh9bPzLonrWDo+ib+DuySoRkuYUK4pgZJ2mbg6daFOBEZygkSyRB8bo1UQUP7EgQDrWe4khb/5GHEfDkrQz3qu/sXvc0Ir1mOUWBFPHC2DjjCn/oMJuUkG1SwM8l2Bfv7h67ssES6YQ2+RjOix4yid7EXS/Ogl45PzCIPSI5+BbNs10JhE0w5uErBHlF53EDTe/TSLc+GU6DB6PP6dH912Njdr3jpNSUQ=
--- a/.hgtags Tue Sep 03 15:50:59 2013 -0500 +++ b/.hgtags Tue Sep 03 18:08:27 2013 -0500 @@ -89,3 +89,4 @@ 009794acc6e37a650f0fae37872e733382ac1c0c 2.6.3 f0d7721d7322dcfb5af33599c2543f27335334bb 2.7-rc f37b5a17e6a0ee17afde2cdde5393dd74715fb58 2.7 +335a558f81dc73afeab4d7be63617392b130117f 2.7.1
--- a/mercurial/tags.py Tue Sep 03 15:50:59 2013 -0500 +++ b/mercurial/tags.py Tue Sep 03 18:08:27 2013 -0500 @@ -290,6 +290,8 @@ # the cache. cachefile.write('\n') for (name, (node, hist)) in cachetags.iteritems(): + for n in hist: + cachefile.write("%s %s\n" % (hex(n), name)) cachefile.write("%s %s\n" % (hex(node), name)) try:
--- a/tests/test-tags.t Tue Sep 03 15:50:59 2013 -0500 +++ b/tests/test-tags.t Tue Sep 03 18:08:27 2013 -0500 @@ -221,6 +221,8 @@ 3 6fa450212aeb2a21ed616a54aea39a4a27894cd7 7d3b718c964ef37b89e550ebdafd5789e76ce1b0 2 7a94127795a33c10a370c93f731fd9fea0b79af6 0c04f2a8af31de17fab7422878ee5a2dadbc943d + bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar + bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar 78391a272241d70354aa14c874552cad6b51bb42 bar Test tag removal: @@ -396,6 +398,11 @@ localtag 1:a0b6fe111088 globaltag 0:bbd179dfa0a7 + $ hg tags -v + tip 2:5c70a037bb37 + localtag 1:a0b6fe111088 + globaltag 0:bbd179dfa0a7 + $ hg tag -r 1 localtag2 $ hg tags -v tip 3:bbfb8cd42be2 @@ -403,4 +410,10 @@ localtag 1:a0b6fe111088 globaltag 0:bbd179dfa0a7 + $ hg tags -v + tip 3:bbfb8cd42be2 + localtag2 1:a0b6fe111088 + localtag 1:a0b6fe111088 + globaltag 0:bbd179dfa0a7 + $ cd ..