Mercurial > hgsubversion
comparison hgsubversion/editor.py @ 447:0d3b5acb1d51
tags: handle edits to tags as gracefully as possible
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Tue, 23 Jun 2009 21:38:27 -0500 |
| parents | 404162e4bb53 |
| children | fbc7cf4fd701 |
comparison
equal
deleted
inserted
replaced
| 446:cbd230043379 | 447:0d3b5acb1d51 |
|---|---|
| 189 if path in self.current.deleted: | 189 if path in self.current.deleted: |
| 190 del self.current.deleted[path] | 190 del self.current.deleted[path] |
| 191 fpath, branch = self.meta.split_branch_path(path, existing=False)[:2] | 191 fpath, branch = self.meta.split_branch_path(path, existing=False)[:2] |
| 192 if not fpath: | 192 if not fpath: |
| 193 return | 193 return |
| 194 if branch not in self.meta.branches: | 194 if (branch not in self.meta.branches and |
| 195 not self.meta.is_path_tag(self.meta.remotename(branch))): | |
| 195 # we know this branch will exist now, because it has at least one file. Rock. | 196 # we know this branch will exist now, because it has at least one file. Rock. |
| 196 self.meta.branches[branch] = None, 0, self.current.rev.revnum | 197 self.meta.branches[branch] = None, 0, self.current.rev.revnum |
| 197 self.current.file = path | 198 self.current.file = path |
| 198 if not copyfrom_path: | 199 if not copyfrom_path: |
| 199 self.ui.note('A %s\n' % path) | 200 self.ui.note('A %s\n' % path) |
