~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge with plan_merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
1410
1410
        self._transform = transform
1411
1411
        self._final_paths = FinalPaths(transform)
1412
1412
        self.__by_parent = None
 
1413
        self._parent_ids = []
1413
1414
 
1414
1415
    def _changes(self, file_id):
1415
1416
        for changes in self._transform.iter_changes():
1712
1713
        return self._transform._tree.walkdirs(prefix)
1713
1714
 
1714
1715
    def get_parent_ids(self):
1715
 
        return self._transform._tree.get_parent_ids()
 
1716
        return self._parent_ids
 
1717
 
 
1718
    def set_parent_ids(self, parent_ids):
 
1719
        self._parent_ids = parent_ids
1716
1720
 
1717
1721
    def get_revision_tree(self, revision_id):
1718
1722
        return self._transform._tree.get_revision_tree(revision_id)