← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 04:59:47 UTC
  • mto: (1393.1.21) (1185.14.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: aaron.bentley@utoronto.ca-20050929045947-ff08a7f6578f9657
Conflict handling where OTHER is deleted

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
25
25
import bzrlib.revision
26
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
27
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
28
 
from bzrlib.changeset import Inventory, Diff3Merge
 
28
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
29
29
from bzrlib.branch import Branch
30
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
31
31
from bzrlib.errors import NoCommits
128
128
            % filename)
129
129
        return "skip"
130
130
 
 
131
    def rem_contents_conflict(self, filename, this_contents, base_contents):
 
132
        base_contents(filename+".BASE", self, False)
 
133
        this_contents(filename+".THIS", self, False)
 
134
        return ReplaceContents(this_contents, None)
 
135
 
131
136
    def finalize(self):
132
137
        if not self.ignore_zero:
133
138
            print "%d conflicts encountered.\n" % self.conflicts