Rev 3561: Tests pass when using _entries_lca as the default algorithm. in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3561
revision-id: john at arbash-meinel.com-20080801180417-z3itgrfu0ai91mgq
parent: john at arbash-meinel.com-20080801164943-nus5wo9ugnm6hvj7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Fri 2008-08-01 13:04:17 -0500
message:
  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.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-08-01 16:49:43 +0000
+++ b/bzrlib/merge.py	2008-08-01 18:04:17 +0000
@@ -560,6 +560,9 @@
         self.reprocess = reprocess
         self.show_base = show_base
         self._lca_trees = lca_trees
+        # Uncommenting this will change the default algorithm to always use
+        # _entries_lca. This can be useful for running the test suite and
+        # making sure we haven't missed any corner cases.
         # if lca_trees is None:
         #     self._lca_trees = [self.base_tree]
         self.pb = pb