/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/conflicts.py

  • Committer: Jan Balster
  • Date: 2006-08-15 12:39:42 UTC
  • mfrom: (1923 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1928.
  • Revision ID: jan@merlinux.de-20060815123942-22c388c6e9a8ac91
merge bzr.dev 1923

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
1
1
# Copyright (C) 2005 by Aaron Bentley
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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