← 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: 2006-02-21 23:12:39 UTC
  • mfrom: (1563.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
Fixup internally generated deprecation warning from merge_inner and unbreak bzr push to new sftp branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
39
39
from bzrlib.osutils import rename, pathjoin
40
40
from progress import DummyProgress
41
41
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
 
42
from bzrlib.symbol_versioning import *
42
43
from bzrlib.trace import mutter, warning, note
43
44
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
44
45
                              conflicts_strings, FinalPaths, create_by_entry,
816
817
                     branch.get_revision_tree(base_revision))'
817
818
        """
818
819
    if this_tree is None:
819
 
        this_tree = this_branch.working_tree()
 
820
        warn("bzrlib.merge.merge_inner requires a this_tree parameter as of "
 
821
             "bzrlib version 0.8.",
 
822
             DeprecationWarning,
 
823
             stacklevel=2)
 
824
        this_tree = this_branch.bzrdir.open_workingtree()
820
825
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree, 
821
826
                    pb=pb)
822
827
    merger.backup_files = backup_files