← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Robert Collins
  • Date: 2005-10-30 00:00:09 UTC
  • mfrom: (1185.16.134)
  • Revision ID: robertc@robertcollins.net-20051030000009-9db99a338a0dfdac
Merge from Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
11
11
class ApplyMerge3:
12
12
    history_based = False
13
13
    """Contents-change wrapper around merge3.Merge3"""
14
 
    def __init__(self, file_id, base, other, show_base=False):
 
14
    def __init__(self, file_id, base, other, show_base=False, reprocess=False):
15
15
        self.file_id = file_id
16
16
        self.base = base
17
17
        self.other = other
18
18
        self.show_base = show_base
 
19
        self.reprocess = reprocess
19
20
 
20
21
    def is_creation(self):
21
22
        return False
58
59
            base_marker = None
59
60
        for line in m3.merge_lines(name_a = "TREE", name_b = "MERGE-SOURCE", 
60
61
                       name_base = "BASE-REVISION",
61
 
                       start_marker=start_marker, base_marker=base_marker):
 
62
                       start_marker=start_marker, base_marker=base_marker,
 
63
                       reprocess = self.reprocess):
62
64
            if line.startswith(start_marker):
63
65
                new_conflicts = True
64
66
                output_file.write(line.replace(start_marker, '<' * 7))