Show More
@@ -296,10 +296,11 b' class localrepository(repo.repository):' | |||||
296 |
|
296 | |||
297 | date: date tuple to use if committing''' |
|
297 | date: date tuple to use if committing''' | |
298 |
|
298 | |||
299 | for x in self.status()[:5]: |
|
299 | if not local: | |
300 | if '.hgtags' in x: |
|
300 | for x in self.status()[:5]: | |
301 | raise util.Abort(_('working copy of .hgtags is changed ' |
|
301 | if '.hgtags' in x: | |
302 | '(please commit .hgtags manually)')) |
|
302 | raise util.Abort(_('working copy of .hgtags is changed ' | |
|
303 | '(please commit .hgtags manually)')) | |||
303 |
|
304 | |||
304 | self.tags() # instantiate the cache |
|
305 | self.tags() # instantiate the cache | |
305 | self._tag(names, node, message, local, user, date) |
|
306 | self._tag(names, node, message, local, user, date) |
@@ -196,3 +196,15 b' test custom commit messages' | |||||
196 | $ hg log -l1 --template "{desc}\n" |
|
196 | $ hg log -l1 --template "{desc}\n" | |
197 | custom tag message |
|
197 | custom tag message | |
198 | second line |
|
198 | second line | |
|
199 | ||||
|
200 | local tag with .hgtags modified | |||
|
201 | ||||
|
202 | $ hg tag hgtags-modified | |||
|
203 | $ hg rollback | |||
|
204 | rolling back to revision 11 (undo commit) | |||
|
205 | $ hg st | |||
|
206 | M .hgtags | |||
|
207 | ? .hgtags.orig | |||
|
208 | ? editor | |||
|
209 | $ hg tag --local baz | |||
|
210 | $ hg revert --no-backup .hgtags |
General Comments 0
You need to be logged in to leave comments.
Login now