/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: John Arbash Meinel
  • Date: 2008-05-29 18:57:31 UTC
  • mto: This revision was merged to the branch mainline in revision 3459.
  • Revision ID: john@arbash-meinel.com-20080529185731-7ibxuku11bwkrb30
https://launchpad.net/bugs/235715
Fix bug #235715 by using the empty list as the text for a base of NULL_REVISION.

Add a test for this case as well.

Show diffs side-by-side

added added

removed removed

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