← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-27 06:12:05 UTC
  • mfrom: (2376.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070327061205-24256d9f15f6757d
(robertc) Merge 0.8 API removal cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1013
1013
                     branch.get_revision_tree(base_revision))'
1014
1014
        """
1015
1015
    if this_tree is None:
1016
 
        warnings.warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
1017
 
             "bzrlib version 0.8.",
1018
 
             DeprecationWarning,
1019
 
             stacklevel=2)
1020
 
        this_tree = this_branch.bzrdir.open_workingtree()
 
1016
        raise BzrError("bzrlib.merge.merge_inner requires a this_tree "
 
1017
            "parameter as of bzrlib version 0.8.")
1021
1018
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1022
1019
                    pb=pb, change_reporter=change_reporter)
1023
1020
    merger.backup_files = backup_files