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

  • Committer: Aaron Bentley
  • Date: 2006-04-05 18:05:15 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060405180515-4be2a622206de1f7
Got ConflictList implemented

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 conflicts_to_strings
 
25
from bzrlib.conflicts import conflicts_to_strings, ConflictList
26
26
from bzrlib.delta import compare_trees
27
27
from bzrlib.errors import (BzrCommandError,
28
28
                           BzrError,
377
377
            results = self.tt.apply()
378
378
            self.write_modified(results)
379
379
            try:
380
 
                working_tree.set_conflict_lines(self.cooked_conflicts)
 
380
                working_tree.set_conflicts(ConflictList(self.cooked_conflicts))
381
381
            except UnsupportedOperation:
382
382
                pass
383
383
        finally: