Rev 3520: Handle when the graphs don't actually combine. 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: 3520
revision-id: john at arbash-meinel.com-20080626150300-247h9y65fipn7487
parent: john at arbash-meinel.com-20080626031656-59y0gqrsq9t3wox9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Thu 2008-06-26 10:03:00 -0500
message:
  Handle when the graphs don't actually combine.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-26 03:16:56 +0000
+++ b/bzrlib/merge.py	2008-06-26 15:03:00 +0000
@@ -1587,7 +1587,10 @@
         return parent_map
 
     def _find_all_ancestors(self):
-        unique_lca = self.graph.find_unique_lca(self.a_rev, self.b_rev)
+        try:
+            unique_lca = self.graph.find_unique_lca(self.a_rev, self.b_rev)
+        except errors.NoCommonAncestor:
+            unique_lca = NULL_REVISION
         interesting = self.graph.find_unique_ancestors(self.a_rev, [unique_lca])
         interesting.update(self.graph.find_unique_ancestors(self.b_rev,
                                                             [unique_lca]))