← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Handled simultaneous renames of parent and child better

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
674
674
                entry = limbo_inv.get(trans_id)
675
675
                if entry is not None:
676
676
                    entry.name = self.final_name(trans_id)
677
 
                    parent_trans_id = self.final_parent(trans_id)
678
 
                    entry.parent_id = self.final_file_id(parent_trans_id)
 
677
                    parent_path = os.path.dirname(path)
 
678
                    entry.parent_id = self._tree.inventory.path2id(parent_path)
679
679
                    inv.add(entry)
680
680
 
681
681
            # requires files and inventory entries to be in place