← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-11-04 16:54:42 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051104165442-a49126bfb45faea7
Change cmd_revert to use merge_inner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
332
332
 
333
333
def merge_inner(this_branch, other_tree, base_tree, ignore_zero=False,
334
334
                backup_files=False, merge_type=ApplyMerge3, 
335
 
                interesting_ids=None, show_base=False, reprocess=False):
 
335
                interesting_ids=None, show_base=False, reprocess=False,
 
336
                interesting_files=None):
336
337
    """Primary interface for merging. 
337
338
 
338
339
        typical use is probably 
340
341
                     branch.get_revision_tree(base_revision))'
341
342
        """
342
343
    merger = Merger(this_branch, other_tree, base_tree)
343
 
    merger.backup_files = False
344
 
    merger.merge_type = ApplyMerge3
 
344
    merger.backup_files = backup_files
 
345
    merger.merge_type = merge_type
345
346
    merger.interesting_ids = interesting_ids
 
347
    if interesting_files:
 
348
        assert not interesting_ids, ('Only supply interesting_ids'
 
349
                                     ' or interesting_files')
 
350
        merger.set_interesting_files(interesting_files)
346
351
    merger.show_base = show_base 
347
352
    merger.reprocess = reprocess
348
353
    merger.conflict_handler = MergeConflictHandler(merger.this_tree, base_tree,