Mercurial > hgsubversion
comparison hg_delta_editor.py @ 279:376ba9399ce6
hg_delta_editor: Fix a bug in marking branches as deleted.
author | Max Bowsher <maxb@f2s.com> |
---|---|
date | Fri, 24 Apr 2009 21:04:25 -0500 |
parents | d978192f0d63 |
children | 153266401676 |
comparison
equal
deleted
inserted
replaced
278:60acc38eac96 | 279:376ba9399ce6 |
---|---|
519 continue # case 1 | 519 continue # case 1 |
520 if paths[p].action == 'D': | 520 if paths[p].action == 'D': |
521 # check for case 5 | 521 # check for case 5 |
522 for known in self.branches: | 522 for known in self.branches: |
523 if self._svnpath(known).startswith(p): | 523 if self._svnpath(known).startswith(p): |
524 self.branches_to_delete.add(br) # case 5 | 524 self.branches_to_delete.add(known) # case 5 |
525 added_branches.update(self.__determine_parent_branch(p, paths[p].copyfrom_path, | 525 added_branches.update(self.__determine_parent_branch(p, paths[p].copyfrom_path, |
526 paths[p].copyfrom_rev, revision.revnum)) | 526 paths[p].copyfrom_rev, revision.revnum)) |
527 for t in tags_to_delete: | 527 for t in tags_to_delete: |
528 del self.tags[t] | 528 del self.tags[t] |
529 for br in self.branches_to_delete: | 529 for br in self.branches_to_delete: |