Rev 3523: get the name right 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: 3523
revision-id: john at arbash-meinel.com-20080626234510-83rvxj28ssj9qvp0
parent: john at arbash-meinel.com-20080626234357-7yjnpl0fkpdnoiuo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Thu 2008-06-26 18:45:10 -0500
message:
  get the name right
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-26 23:43:57 +0000
+++ b/bzrlib/merge.py	2008-06-26 23:45:10 +0000
@@ -1594,7 +1594,7 @@
                 if not cur_lcas:
                     mutter('no common ancestor, using NULL')
                     unique_lca = NULL_REVISION
-                    if not self.vf.has_revision(NULL_REVISION):
+                    if not self.vf.has_version(NULL_REVISION):
                         self.vf.add_lines(NULL_REVISION, [], [])
                 else:
                     unique_lca = cur_lcas.pop()
@@ -1626,7 +1626,7 @@
             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):
+            if not self.vf.has_version(NULL_REVISION):
                 self.vf.add_lines(NULL_REVISION, [], [])
         return self._find_unique_parents((self.a_rev, self.b_rev), unique_lca)