← 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: 2008-05-29 20:34:27 UTC
  • mfrom: (3287.17.2 lca_with_null_235715)
  • Revision ID: pqm@pqm.ubuntu.com-20080529203427-tp2iw6h86fd1sauh
(jam) Fix bug #235715,
        use an empty list for an LCA base if we encounter NULL_REVISION

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())