# HG changeset patch # User Dirkjan Ochtman # Date 1244620293 -7200 # Node ID 09625f3abdb077b9ff3c2012dbbe568c22d55a20 # Parent 94f7e8c53c36829a321928f778135ef7892a5aa6 branches: simplify branch deletion a little bit diff --git a/hgsubversion/hg_delta_editor.py b/hgsubversion/hg_delta_editor.py --- a/hgsubversion/hg_delta_editor.py +++ b/hgsubversion/hg_delta_editor.py @@ -731,12 +731,10 @@ class HgChangeReceiver(delta.Editor): self.committags(tbdelta['tags'], rev, closebranches) # 4. close any branches that need it - for branch in tbdelta['branches'][1]: - # self.get_parent_revision(rev.revnum, branch) - ha = closebranches.get(branch) - if ha is None: + for branch, parent in closebranches.iteritems(): + if parent is None: continue - self.delbranch(branch, ha, rev) + self.delbranch(branch, parent, rev) self._save_metadata() self.clear_current_info()