← 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: 2005-10-08 00:39:04 UTC
  • mfrom: (1185.1.52)
  • Revision ID: robertc@robertcollins.net-20051008003904-aaffaea2778efe3e
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
140
140
    def rem_contents_conflict(self, filename, this_contents, base_contents):
141
141
        base_contents(filename+".BASE", self, False)
142
142
        this_contents(filename+".THIS", self, False)
 
143
        return ReplaceContents(this_contents, None)
 
144
 
 
145
    def rem_contents_conflict(self, filename, this_contents, base_contents):
 
146
        base_contents(filename+".BASE", self, False)
 
147
        this_contents(filename+".THIS", self, False)
143
148
        self.conflict("Other branch deleted locally modified file %s" %
144
149
                      filename)
145
150
        return ReplaceContents(this_contents, None)