Rev 3522: We need to add in the NULL_REVISION if we have to use it as a base. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

------------------------------------------------------------
revno: 3522
revision-id: john at arbash-meinel.com-20080626234357-7yjnpl0fkpdnoiuo
parent: john at arbash-meinel.com-20080626234053-jxkl4wuu79b81e98
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Thu 2008-06-26 18:43:57 -0500
message:
  We need to add in the NULL_REVISION if we have to use it as a base.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-26 23:40:53 +0000
+++ b/bzrlib/merge.py	2008-06-26 23:43:57 +0000
@@ -1594,6 +1594,8 @@
                 if not cur_lcas:
                     mutter('no common ancestor, using NULL')
                     unique_lca = NULL_REVISION
+                    if not self.vf.has_revision(NULL_REVISION):
+                        self.vf.add_lines(NULL_REVISION, [], [])
                 else:
                     unique_lca = cur_lcas.pop()
 
@@ -1624,6 +1626,8 @@
             unique_lca = self.graph.find_unique_lca(self.a_rev, self.b_rev)
         except errors.NoCommonAncestor:
             unique_lca = NULL_REVISION
+            if not self.vf.has_revision(NULL_REVISION):
+                self.vf.add_lines(NULL_REVISION, [], [])
         return self._find_unique_parents((self.a_rev, self.b_rev), unique_lca)
 
     def _get_interesting_texts(self, parent_map):