Rev 3560: Optimizing how we extracted multiple trees left a path that didn't create a base_tree. 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: 3560
revision-id: john at arbash-meinel.com-20080801164943-nus5wo9ugnm6hvj7
parent: john at arbash-meinel.com-20080801164001-h8qnpzd3oflukm4n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Fri 2008-08-01 11:49:43 -0500
message:
  Optimizing how we extracted multiple trees left a path that didn't create a base_tree.
  Fixed.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-08-01 16:40:01 +0000
+++ b/bzrlib/merge.py	2008-08-01 16:49:43 +0000
@@ -356,6 +356,7 @@
                      ensure_null(self.other_basis)]
         if NULL_REVISION in revisions:
             self.base_rev_id = NULL_REVISION
+            self.base_tree = self.revision_tree(self.base_rev_id)
         else:
             lcas = self.revision_graph.find_lca(revisions[0], revisions[1])
             if len(lcas) == 0: