/brz/remove-bazaar

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Committer: Aaron Bentley
Date: 2006-01-17 21:22:57 UTC
mto: (1534.9.2 Transactional Tree Transforms) (1558.1.4 Aaron's integration) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: abentley@panoramicfeedback.com-20060117212257-ced70932e1269d85

Fixed final_parent, for the case where finding a parent adds tree id paths.

files modified:
bzrlib/transform.py

Show diffs side-by-side

added added

removed removed

bzrlib/transform.py

306

306

"""

307

307

by_parent = {}

308

308

items = list(self._new_parent.iteritems())

309

items.extend((t, self.final_parent(t)) for t in self._tree_id_paths)

309

items.extend((t, self.final_parent(t)) for t in

310

self._tree_id_paths.keys())

310

311

for trans_id, parent_id in items:

311

312

if parent_id not in by_parent:

312

313

by_parent[parent_id] = set()

Older »