← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-26 16:31:49 UTC
  • mfrom: (1813 +trunk)
  • mto: (1711.7.2 win32)
  • mto: This revision was merged to the branch mainline in revision 1822.
  • Revision ID: john@arbash-meinel.com-20060626163149-2213f2f2d895829d
[merge] bzr.dev 1813

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: