comparison mercurial/localrepo.py @ 5234:b772c0b9f0bd

Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 12:24:54 -0700
parents 90d9ec0dc69d bddb4ff134c0
children 5517aa5aafb0
comparison
equal deleted inserted replaced
5210:90d9ec0dc69d 5234:b772c0b9f0bd
149 try: 149 try:
150 prevtags = self.filectx('.hgtags', parent).data() 150 prevtags = self.filectx('.hgtags', parent).data()
151 except revlog.LookupError: 151 except revlog.LookupError:
152 pass 152 pass
153 fp = self.wfile('.hgtags', 'wb') 153 fp = self.wfile('.hgtags', 'wb')
154 if prevtags:
155 fp.write(prevtags)
154 156
155 # committed tags are stored in UTF-8 157 # committed tags are stored in UTF-8
156 writetag(fp, name, util.fromlocal, prevtags) 158 writetag(fp, name, util.fromlocal, prevtags)
157 159
158 if use_dirstate and '.hgtags' not in self.dirstate: 160 if use_dirstate and '.hgtags' not in self.dirstate: