← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Robert Collins
  • Date: 2005-09-29 23:54:03 UTC
  • mfrom: (1185.12.1)
  • mto: This revision was merged to the branch mainline in revision 1422.
  • Revision ID: robertc@robertcollins.net-20050929235403-a08f2b91aa0718eb
Aarons export fix and conflict on deleted and modified files fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
224
224
        if contents.old_contents is None and contents.new_contents is None:
225
225
            return None
226
226
        if contents.new_contents is None:
 
227
            this_contents = get_contents(entry, this)
227
228
            if this_path is not None and os.path.exists(this_path):
 
229
                if this_contents != contents.old_contents:
 
230
                    return conflict_handler.rem_contents_conflict(this_path, 
 
231
                        this_contents, contents.old_contents)
228
232
                return contents
229
233
            else:
230
234
                return None