~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Committer: Andrew Bennetts
Date: 2009-12-18 06:41:53 UTC
mfrom: (4869.2.7 merge-minor-refactoring)
mto: (4869.3.19 per-file-merge-hook-491711) (4973.1.1 integration)
mto: This revision was merged to the branch mainline in revision 4975.
Revision ID: andrew.bennetts@canonical.com-20091218064153-bais4havqbrzup0x

Merge merge-minor-refactoring.

files modified:
bzrlib/merge.py

Show diffs side-by-side

added added

removed removed

bzrlib/merge.py

1468

base = self.base_tree

1469

else:

1470

base = None

1471

plan = self._plan_weave_merge(file_id, base)

1471

plan = self._plan_file_merge(file_id, base)

1472

if 'merge' in debug.debug_flags:

1473

plan = list(plan)

1474

trans_id = self.tt.trans_id_file_id(file_id)

1479

'>>>>>>> MERGE-SOURCE\n')

1480

return textmerge.merge_lines(self.reprocess)

1481

1482

def _plan_weave_merge(self, file_id, base):

1482

def _plan_file_merge(self, file_id, base):

1483

return self.this_tree.plan_file_merge(

1484

file_id, self.other_tree, base=base)

1485

1505

1506

class LCAMerger(WeaveMerger):

1507

1508

def _plan_weave_merge(self, file_id, base):

1508

def _plan_file_merge(self, file_id, base):

1509

return self.this_tree.plan_file_lca_merge(

1510

file_id, self.other_tree, base=base)

1511

Older »