# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1184769961 -7200
# Node ID 8535c1770dd308018503ce2a6004cfb540b122d4
# Parent  5e89b0dafce54762a26eb17d5192fdef33eef6b7# Parent  5fb8f5992a3d32ddbd3d31e24968a341dbc7923e
merge with crew-stable

diff -r 5e89b0dafce5 -r 8535c1770dd3 hgext/mq.py
diff -r 5e89b0dafce5 -r 8535c1770dd3 mercurial/commands.py
diff -r 5e89b0dafce5 -r 8535c1770dd3 mercurial/localrepo.py
diff -r 5e89b0dafce5 -r 8535c1770dd3 tests/test-mq
diff -r 5e89b0dafce5 -r 8535c1770dd3 tests/test-mq.out
diff -r 5e89b0dafce5 -r 8535c1770dd3 tests/test-tag
--- a/tests/test-tag	Tue Jul 17 15:47:32 2007 -0700
+++ b/tests/test-tag	Wed Jul 18 16:46:01 2007 +0200
@@ -29,14 +29,18 @@
 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