← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Fixup internally generated deprecation warning from merge_inner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
38
38
import bzrlib.osutils
39
39
from bzrlib.osutils import rename, pathjoin
40
40
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
 
41
from bzrlib.symbol_versioning import *
41
42
from bzrlib.trace import mutter, warning, note
42
43
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
43
44
                              conflicts_strings, FinalPaths, create_by_entry,
807
808
                     branch.get_revision_tree(base_revision))'
808
809
        """
809
810
    if this_tree is None:
810
 
        this_tree = this_branch.working_tree()
 
811
        warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
 
812
             "bzrlib version 0.8.",
 
813
             DeprecationWarning,
 
814
             stacklevel=2)
 
815
        this_tree = this_branch.bzrdir.open_workingtree()
811
816
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree)
812
817
    merger.backup_files = backup_files
813
818
    merger.merge_type = merge_type