/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/test_transform.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3230
3230
        preview.delete_contents(file_trans_id)
3231
3231
        preview.create_file('a\nb\n', file_trans_id)
3232
3232
        preview_tree = preview.get_preview_tree()
3233
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
3233
        merger = Merger.from_revision_ids(preview_tree,
3234
3234
                                          child_tree.branch.last_revision(),
3235
3235
                                          other_branch=child_tree.branch,
3236
3236
                                          tree_branch=work_tree.branch)
3249
3249
        tree2 = self.make_branch_and_tree('tree2')
3250
3250
        tree2.set_root_id('TREE_ROOT')
3251
3251
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3252
 
                                         None, tree.basis_tree())
 
3252
                                         tree.basis_tree())
3253
3253
        merger.merge_type = Merge3Merger
3254
3254
        merger.do_merge()
3255
3255
 
3265
3265
        tt.create_file('baz', trans_id)
3266
3266
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
3267
3267
        self.build_tree_contents([('tree2/foo', 'qux')])
3268
 
        pb = None
3269
3268
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
3270
 
                                         pb, tree.basis_tree())
 
3269
                                         tree.basis_tree())
3271
3270
        merger.merge_type = Merge3Merger
3272
3271
        merger.do_merge()
3273
3272