/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

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
88
88
                      sequencematcher=sequence_matcher)
89
89
 
90
90
    ud = list(ud)
 
91
    if len(ud) == 0: # Identical contents, nothing to do
 
92
        return
91
93
    # work-around for difflib being too smart for its own good
92
94
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
93
95
    if not oldlines:
861
863
        """
862
864
        try:
863
865
            old_kind = self.old_tree.kind(file_id)
864
 
        except errors.NoSuchId:
 
866
        except (errors.NoSuchId, errors.NoSuchFile):
865
867
            old_kind = None
866
868
        try:
867
869
            new_kind = self.new_tree.kind(file_id)
868
 
        except errors.NoSuchId:
 
870
        except (errors.NoSuchId, errors.NoSuchFile):
869
871
            new_kind = None
870
872
 
871
873
        result = DiffPath._diff_many(self.differs, file_id, old_path,