← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Fixed deprecated op use in test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
74
74
 
75
75
def transform_tree(from_tree, to_tree, interesting_ids=None):
76
76
    merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
77
 
                interesting_ids=interesting_ids)
 
77
                interesting_ids=interesting_ids, this_tree=from_tree)
78
78
 
79
79
 
80
80
class Merger(object):