← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-03 13:48:52 UTC
  • mfrom: (1835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1836.
  • Revision ID: john@arbash-meinel.com-20060703134852-295eeb195b8e2811
[merge] bzr.dev 1835

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
207
207
        """Select the conflicts associated with paths in a tree.
208
208
        
209
209
        File-ids are also used for this.
 
210
        :return: a pair of ConflictLists: (not_selected, selected)
210
211
        """
211
212
        path_set = set(paths)
212
213
        ids = {}
273
274
            return -1
274
275
        return cmp(self._cmp_list(), other._cmp_list())
275
276
 
 
277
    def __hash__(self):
 
278
        return hash((type(self), self.path, self.file_id))
 
279
 
276
280
    def __eq__(self, other):
277
281
        return self.__cmp__(other) == 0
278
282