← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

(mbp) merge bzr.dev to 0.8, prepare for release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
292
292
        global ctype
293
293
        return ctype[type](**kwargs)
294
294
 
 
295
    @staticmethod
 
296
    def sort_key(conflict):
 
297
        if conflict.path is not None:
 
298
            return conflict.path, conflict.typestring
 
299
        elif getattr(conflict, "conflict_path", None) is not None:
 
300
            return conflict.conflict_path, conflict.typestring
 
301
        else:
 
302
            return None, conflict.typestring
 
303
 
295
304
 
296
305
class PathConflict(Conflict):
297
306
    """A conflict was encountered merging file paths"""