← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-18 07:00:11 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100118070011-zu374wvd0lcgai5a
Move news_merge plugin from contrib to bzrlib/plugins, change it to be enabled via a 'news_merge_files' config option, move more code out of the __init__ to minimise overhead, and add lots of docstrings, add NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
495
495
                  'other_tree': self.other_tree,
496
496
                  'interesting_ids': self.interesting_ids,
497
497
                  'interesting_files': self.interesting_files,
498
 
                  'pp': self.pp,
 
498
                  'pp': self.pp, 'this_branch': self.this_branch,
499
499
                  'do_merge': False}
500
500
        if self.merge_type.requires_base:
501
501
            kwargs['base_tree'] = self.base_tree
605
605
                 interesting_ids=None, reprocess=False, show_base=False,
606
606
                 pb=progress.DummyProgress(), pp=None, change_reporter=None,
607
607
                 interesting_files=None, do_merge=True,
608
 
                 cherrypick=False, lca_trees=None):
 
608
                 cherrypick=False, lca_trees=None, this_branch=None):
609
609
        """Initialize the merger object and perform the merge.
610
610
 
611
611
        :param working_tree: The working tree to apply the merge to
612
612
        :param this_tree: The local tree in the merge operation
613
613
        :param base_tree: The common tree in the merge operation
614
614
        :param other_tree: The other tree to merge changes from
 
615
        :param this_branch: The branch associated with this_tree
615
616
        :param interesting_ids: The file_ids of files that should be
616
617
            participate in the merge.  May not be combined with
617
618
            interesting_files.
640
641
        self.this_tree = working_tree
641
642
        self.base_tree = base_tree
642
643
        self.other_tree = other_tree
 
644
        self.this_branch = this_branch
643
645
        self._raw_conflicts = []
644
646
        self.cooked_conflicts = []
645
647
        self.reprocess = reprocess