/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

Fixed weave conflict handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
145
145
        Handle weave conflicts by producing a .THIS, and .OTHER.  The
146
146
        main file will be a version with diff3-style conflicts.
147
147
        """
148
 
        self.add_suffix(filename, ".THIS")
 
148
        self.add_suffix(filename, ".THIS", fix_inventory=False)
149
149
        out_file.commit()
150
150
        self.dump(weave.get_iter(other_i), filename+".OTHER")
151
151
        self.conflict("Text conflict encountered in %s" % filename)