/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/diff.py

  • Committer: Aaron Bentley
  • Date: 2007-12-08 01:00:58 UTC
  • mfrom: (3095 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071208010058-1vuj9qn49qfu808e
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
86
86
                      sequencematcher=sequence_matcher)
87
87
 
88
88
    ud = list(ud)
 
89
    if len(ud) == 0: # Identical contents, nothing to do
 
90
        return
89
91
    # work-around for difflib being too smart for its own good
90
92
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
91
93
    if not oldlines:
741
743
        """
742
744
        try:
743
745
            old_kind = self.old_tree.kind(file_id)
744
 
        except errors.NoSuchId:
 
746
        except (errors.NoSuchId, errors.NoSuchFile):
745
747
            old_kind = None
746
748
        try:
747
749
            new_kind = self.new_tree.kind(file_id)
748
 
        except errors.NoSuchId:
 
750
        except (errors.NoSuchId, errors.NoSuchFile):
749
751
            new_kind = None
750
752
 
751
753
        result = DiffPath._diff_many(self.differs, file_id, old_path,