/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

  • Committer: Aaron Bentley
  • Date: 2008-06-06 16:40:46 UTC
  • mfrom: (3482 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3483.
  • Revision ID: aaron@aaronbentley.com-20080606164046-ghbxplxuhtpcb9iz
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1434
1434
        _PlanMergeBase.__init__(self, a_rev, b_rev, vf)
1435
1435
        self.lcas = graph.find_lca(a_rev, b_rev)
1436
1436
        for lca in self.lcas:
1437
 
            lca_lines = self.vf.get_lines(lca)
 
1437
            if _mod_revision.is_null(lca):
 
1438
                lca_lines = []
 
1439
            else:
 
1440
                lca_lines = self.vf.get_lines(lca)
1438
1441
            matcher = patiencediff.PatienceSequenceMatcher(None, self.lines_a,
1439
1442
                                                           lca_lines)
1440
1443
            blocks = list(matcher.get_matching_blocks())