← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
276
276
        self.modified = []
277
277
        self.unchanged = []
278
278
 
 
279
    def has_changed(self):
 
280
        changes = len(self.added) + len(self.removed) + len(self.renamed)
 
281
        changes += len(self.modified) 
 
282
        return (changes != 0)
279
283
 
280
284
    def touches_file_id(self, file_id):
281
285
        """Return True if file_id is modified by this delta."""