← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Add WorkingTree.add_conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
274
274
            return -1
275
275
        return cmp(self._cmp_list(), other._cmp_list())
276
276
 
 
277
    def __hash__(self):
 
278
        return hash((type(self), self.path, self.file_id))
 
279
 
277
280
    def __eq__(self, other):
278
281
        return self.__cmp__(other) == 0
279
282