← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2010-04-24 00:29:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5186.
  • Revision ID: aaron@aaronbentley.com-20100424002912-np8lkz9u1l9a9mxq
Fix switch/merge when a ConfigurableFileMerger is used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
704
704
        :param this_tree: The local tree in the merge operation
705
705
        :param base_tree: The common tree in the merge operation
706
706
        :param other_tree: The other tree to merge changes from
707
 
        :param this_branch: The branch associated with this_tree
 
707
        :param this_branch: The branch associated with this_tree.  Defaults to
 
708
            this_tree.branch if not supplied.
708
709
        :param interesting_ids: The file_ids of files that should be
709
710
            participate in the merge.  May not be combined with
710
711
            interesting_files.
728
729
        if interesting_files is not None and interesting_ids is not None:
729
730
            raise ValueError(
730
731
                'specify either interesting_ids or interesting_files')
 
732
        if this_branch is None:
 
733
            this_branch = this_tree.branch
731
734
        self.interesting_ids = interesting_ids
732
735
        self.interesting_files = interesting_files
733
736
        self.this_tree = working_tree