--- a/mercurial/localrepo.py Mon Apr 19 11:31:19 2010 +0200
+++ b/mercurial/localrepo.py Mon Apr 19 17:41:12 2010 +0900
@@ -164,9 +164,13 @@
if c in allchars:
raise util.Abort(_('%r cannot be used in a tag name') % c)
+ branches = self.branchmap()
for name in names:
self.hook('pretag', throw=True, node=hex(node), tag=name,
local=local)
+ if name in branches:
+ self.ui.warn(_("warning: tag %s conflicts with existing"
+ " branch name\n") % name)
def writetags(fp, names, munge, prevtags):
fp.seek(0, 2)