← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-06 19:15:12 UTC
  • mfrom: (3087.1.1 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20071206191512-6tvqmou1db89q6oi
Diff handles missing files correctly, with no tracebacks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
743
743
        """
744
744
        try:
745
745
            old_kind = self.old_tree.kind(file_id)
746
 
        except errors.NoSuchId:
 
746
        except (errors.NoSuchId, errors.NoSuchFile):
747
747
            old_kind = None
748
748
        try:
749
749
            new_kind = self.new_tree.kind(file_id)
750
 
        except errors.NoSuchId:
 
750
        except (errors.NoSuchId, errors.NoSuchFile):
751
751
            new_kind = None
752
752
 
753
753
        result = DiffPath._diff_many(self.differs, file_id, old_path,