Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 13136:6320101a638c
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 14 Dec 2010 17:10:01 -0600 |
parents | c36dad4f6e54 c1492615cdee |
children | f02d7a562a21 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Dec 09 17:33:40 2010 -0600 +++ b/mercurial/localrepo.py Tue Dec 14 17:10:01 2010 -0600 @@ -308,10 +308,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)