← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-06 23:53:08 UTC
  • mfrom: (1551.19.18 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071206235308-1ol3uk5sbttviy3e
Update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
20
20
import warnings
21
21
 
22
22
from bzrlib import (
 
23
    debug,
23
24
    errors,
24
25
    osutils,
25
26
    patiencediff,
993
994
        and conflicts.
994
995
        """
995
996
        plan = self.this_tree.plan_file_merge(file_id, self.other_tree)
 
997
        if 'merge' in debug.debug_flags:
 
998
            plan = list(plan)
 
999
            trans_id = self.tt.trans_id_file_id(file_id)
 
1000
            name = self.tt.final_name(trans_id) + '.plan'
 
1001
            contents = ('%10s|%s' % l for l in plan)
 
1002
            self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
996
1003
        textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
997
1004
            '>>>>>>> MERGE-SOURCE\n')
998
1005
        return textmerge.merge_lines(self.reprocess)