← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-01 18:04:17 UTC
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080801180417-z3itgrfu0ai91mgq
Tests pass when using _entries_lca as the default algorithm.

The only test that doesn't pass is a bug in MultiWalker, which has a fix
being merged already.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
560
560
        self.reprocess = reprocess
561
561
        self.show_base = show_base
562
562
        self._lca_trees = lca_trees
 
563
        # Uncommenting this will change the default algorithm to always use
 
564
        # _entries_lca. This can be useful for running the test suite and
 
565
        # making sure we haven't missed any corner cases.
563
566
        # if lca_trees is None:
564
567
        #     self._lca_trees = [self.base_tree]
565
568
        self.pb = pb