← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-19 08:31:08 UTC
  • mfrom: (1666.1.5 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060419083108-fab2970f4575b010
Change the default branch format to be metadir. (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,
762
762
            c = Conflict.factory('path conflict', path=this_path,
763
763
                                 conflict_path=other_path, file_id=file_id)
764
764
            self.cooked_conflicts.append(c)
 
765
        self.cooked_conflicts.sort(key=Conflict.sort_key)
765
766
 
766
767
 
767
768
class WeaveMerger(Merge3Merger):