Merge with myself.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with myself.
manifest hash:
e47e1ba87ecb28a08f819401fd8c2a88bc830261
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh
ka6ciaH1pQLhOyKgqdbqwOA=
=pOV4
-----END PGP SIGNATURE-----
--- a/mercurial/commands.py Fri Jul 15 12:17:03 2005 +0100
+++ b/mercurial/commands.py Fri Jul 15 13:42:19 2005 +0100
@@ -1023,9 +1023,8 @@
ui.status("(please commit .hgtags manually)\n")
return -1
- add = not os.path.exists(repo.wjoin(".hgtags"))
repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
- if add:
+ if repo.dirstate.state(".hgtags") == '?':
repo.add([".hgtags"])
if not opts['text']: