diff -r dbc546811dd6 -r c1492615cdee mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Dec 13 11:51:01 2010 -0600 +++ b/mercurial/localrepo.py Mon Dec 13 21:20:30 2010 -0600 @@ -296,10 +296,11 @@ date: date tuple to use if committing''' - for x in self.status()[:5]: - if '.hgtags' in x: - raise util.Abort(_('working copy of .hgtags is changed ' - '(please commit .hgtags manually)')) + if not local: + for x in self.status()[:5]: + if '.hgtags' in x: + raise util.Abort(_('working copy of .hgtags is changed ' + '(please commit .hgtags manually)')) self.tags() # instantiate the cache self._tag(names, node, message, local, user, date)