merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Wed, 18 Jul 2007 16:46:01 +0200
changeset 4915 8535c1770dd3
parent 4908 5e89b0dafce5 (current diff)
parent 4914 5fb8f5992a3d (diff)
child 4917 7d745e9d2cf0
merge with crew-stable
hgext/mq.py
mercurial/commands.py
mercurial/localrepo.py
tests/test-mq
tests/test-mq.out
--- a/tests/test-tag
+++ b/tests/test-tag
@@ -29,14 +29,18 @@ newline'
 hg tag -l 'xx:xx'
 
 echo % issue 601
-mv .hg/localtags .hg/ltags
-head -1 .hg/ltags | tr -d '\n' > .hg/localtags
+python << EOF
+f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
+f = file('.hg/localtags', 'w'); f.write(last); f.close()
+EOF
 cat .hg/localtags
 hg tag -l localnewline
 cat .hg/localtags
 
-mv .hgtags hgtags
-head -1 hgtags | tr -d '\n' > .hgtags
+python << EOF
+f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
+f = file('.hgtags', 'w'); f.write(last); f.close()
+EOF
 hg ci -d '1000000 0' -m'broken manual edit of .hgtags'
 cat .hgtags
 hg tag -d '1000000 0' newline