/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

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
539
539
        if child_id is None:
540
540
            return lexists(self._tree.abspath(childpath))
541
541
        else:
542
 
            if tt.final_parent(child_id) != parent_id:
 
542
            if self.final_parent(child_id) != parent_id:
543
543
                return False
544
 
            if child_id in tt._removed_contents:
 
544
            if child_id in self._removed_contents:
545
545
                # XXX What about dangling file-ids?
546
546
                return False
547
547
            else: