#
#
# patch "database_check.cc"
#  from [eb2f10d33d8a4b345982a09ccb29a3d4235c06ab]
#    to [beb0e60421b8bf7552071a9af31ef6630cfd3b51]
#
============================================================
--- database_check.cc	eb2f10d33d8a4b345982a09ccb29a3d4235c06ab
+++ database_check.cc	beb0e60421b8bf7552071a9af31ef6630cfd3b51
@@ -641,7 +641,19 @@ check_branch_leaves(database & db, map<s
           set<revision_id> computed_leaves;
 
           db.get_branch_leaves(i->value, cached_leaves);
-          db.compute_branch_leaves(i->value, computed_leaves);
+          try
+            {
+              db.compute_branch_leaves(i->value, computed_leaves);
+            }
+          catch (std::exception & e)
+            {
+              if (string(e.what()).find("height") != string::npos)
+                {
+                  L(FL("error loading height when checking heads of '%s'") % i->value);
+                }
+              else
+                throw;
+            }
 
           checked_branches[name].heads_ok = cached_leaves == computed_leaves;
           ++ticks;