~ubuntu-branches/ubuntu/gutsy/bzr/gutsy

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

• browse files at revision 40
• compare with another revision
• download diff
• download tarball
• view history from revision 40

Show diffs side-by-side

added

removed

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

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1