← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2006-04-18 22:41:16 UTC
  • mto: (1711.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1671.
  • Revision ID: robertc@robertcollins.net-20060418224116-9b723440fa56e404
 * 'Metadir' is now the default disk format. This improves behaviour in
   SFTP using circumstances and allows binding and rebinding and easier
   use of repositories. (Robert Collins, Aaron Bentley).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
22
22
 
23
23
import bzrlib
24
24
from bzrlib.branch import Branch
25
 
from bzrlib.conflicts import ConflictList
 
25
from bzrlib.conflicts import ConflictList, Conflict
26
26
from bzrlib.delta import compare_trees
27
27
from bzrlib.errors import (BzrCommandError,
28
28
                           BzrError,
761
761
            c = Conflict.factory('path conflict', path=this_path,
762
762
                                 conflict_path=other_path, file_id=file_id)
763
763
            self.cooked_conflicts.append(c)
 
764
        self.cooked_conflicts.sort(key=Conflict.sort_key)
764
765
 
765
766
 
766
767
class WeaveMerger(Merge3Merger):