← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-07-25 21:25:00 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2664.
  • Revision ID: abentley@panoramicfeedback.com-20070725212500-fgat8y4yyrb18p8l
Add merge_type to merge_from_branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
800
800
        self._control_files.put(filename, my_file)
801
801
 
802
802
    @needs_write_lock # because merge pulls data into the branch.
803
 
    def merge_from_branch(self, branch, to_revision=None, from_revision=None):
 
803
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
 
804
        merge_type=None):
804
805
        """Merge from a branch into this working tree.
805
806
 
806
807
        :param branch: The branch to merge from.
838
839
            if merger.base_rev_id == merger.other_rev_id:
839
840
                raise errors.PointlessMerge
840
841
            merger.backup_files = False
841
 
            merger.merge_type = Merge3Merger
 
842
            if merge_type is None:
 
843
                merger.merge_type = Merge3Merger
 
844
            else:
 
845
                merger.merge_type = merge_type
842
846
            merger.set_interesting_files(None)
843
847
            merger.show_base = False
844
848
            merger.reprocess = False