/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Michael Hudson
  • Date: 2007-11-29 13:23:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3189.
  • Revision ID: michael.hudson@canonical.com-20071129132346-jn46168dkl0st0tb
restore the default behaviour of Merge3Merger.__init__().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
353
353
                  'other_tree': self.other_tree,
354
354
                  'interesting_ids': self.interesting_ids,
355
355
                  'interesting_files': self.interesting_files,
356
 
                  'pp': self.pp}
 
356
                  'pp': self.pp,
 
357
                  'do_merge': False}
357
358
        if self.merge_type.requires_base:
358
359
            kwargs['base_tree'] = self.base_tree
359
360
        if self.merge_type.supports_reprocess:
422
423
    def __init__(self, working_tree, this_tree, base_tree, other_tree, 
423
424
                 interesting_ids=None, reprocess=False, show_base=False,
424
425
                 pb=DummyProgress(), pp=None, change_reporter=None,
425
 
                 interesting_files=None):
 
426
                 interesting_files=None, do_merge=True):
426
427
        """Initialize the merger object and perform the merge.
427
428
 
428
429
        :param working_tree: The working tree to apply the merge to
462
463
        self.change_reporter = change_reporter
463
464
        if self.pp is None:
464
465
            self.pp = ProgressPhase("Merge phase", 3, self.pb)
 
466
        if do_merge:
 
467
            self.do_merge()
465
468
 
466
469
    def do_merge(self):
467
470
        self.this_tree.lock_tree_write()
1002
1005
    def __init__(self, working_tree, this_tree, base_tree, other_tree, 
1003
1006
                 interesting_ids=None, pb=DummyProgress(), pp=None,
1004
1007
                 reprocess=False, change_reporter=None,
1005
 
                 interesting_files=None):
 
1008
                 interesting_files=None, do_merge=True):
1006
1009
        super(WeaveMerger, self).__init__(working_tree, this_tree, 
1007
1010
                                          base_tree, other_tree, 
1008
1011
                                          interesting_ids=interesting_ids, 
1009
1012
                                          pb=pb, pp=pp, reprocess=reprocess,
1010
 
                                          change_reporter=change_reporter)
 
1013
                                          change_reporter=change_reporter,
 
1014
                                          do_merge=do_merge)
1011
1015
 
1012
1016
    def _merged_lines(self, file_id):
1013
1017
        """Generate the merged lines.