← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-09 02:34:50 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050809023450-ddb4910cc8d810cd
Removed use of patch and diff in merge, removed patch.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
197
197
        other_path = other.readonly_path(entry.id)    
198
198
        return merge_factory(base_path, other_path)
199
199
 
200
 
    if isinstance(contents, changeset.PatchApply):
201
 
        return make_merge()
202
200
    if isinstance(contents, changeset.ReplaceContents):
203
201
        if contents.old_contents is None and contents.new_contents is None:
204
202
            return None