/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-19 15:46:01 UTC
  • mto: This revision was merged to the branch mainline in revision 3130.
  • Revision ID: abentley@panoramicfeedback.com-20071219154601-c530qweqgev4z7x5
Handle diff with property change correctly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
844
844
            elif renamed:
845
845
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
846
846
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
847
 
            elif changed_content:
 
847
            else:
 
848
                # if it was produced by _iter_changes, it must be
 
849
                # modified *somehow*, either content or execute bit.
848
850
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
849
851
                                   newpath_encoded, prop_str))
850
852
            if changed_content: