← 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: 2011-06-28 15:58:20 UTC
  • mfrom: (5993.2.4 merge-inner-rootless)
  • Revision ID: pqm@pqm.ubuntu.com-20110628155820-g1hpzbqc5573rts5
(jelmer) Re-introduce root when merge result is empty tree. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1966
1966
    """
1967
1967
    if this_tree is None:
1968
1968
        raise errors.BzrError("bzrlib.merge.merge_inner requires a this_tree "
1969
 
                              "parameter as of bzrlib version 0.8.")
 
1969
                              "parameter")
1970
1970
    merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
1971
1971
                    pb=pb, change_reporter=change_reporter)
1972
1972
    merger.backup_files = backup_files