# 
# patch "ChangeLog"
#  from [14ffab5654181abed3b704ec6b26e93a5549892c]
#    to [cc5359fb82a469300172222ba5ebfab9b55c0f85]
# 
# patch "contrib/ciabot_monotone.py"
#  from [53817a19420055452a332b922bd85e414b2b042f]
#    to [7c3c9404806ed0572e888ad12a206c7438884ec1]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-13  Nathaniel Smith  <address@hidden>
 
+	* contrib/ciabot_monotone.py (main): Optimistically run 'db
+	migrate' before using database.
+
+2005-07-13  Nathaniel Smith  <address@hidden>
+
 	* schema_migration.cc (migrate_monotone_schema)
 	(migrator::migrate): Move the "nothing happened" check, and don't
 	vacuum unless a migration occurred.
--- contrib/ciabot_monotone.py
+++ contrib/ciabot_monotone.py
@@ -99,6 +99,9 @@
     def db_init(self):
         self._run_monotone(["db", "init"])
 
+    def db_migrate(self):
+        self._run_monotone(["db", "migrate"])
+
     def ensure_db_exists(self):
         if not os.path.exists(self.db):
             self.db_init()
@@ -263,6 +266,7 @@
         c = config()
         m = Monotone(c.monotone_exec, os.path.join(state_dir, "database.db"))
         m.ensure_db_exists()
+        m.db_migrate()
         for server, collection in c.watch_list:
             m.pull(server, collection)
         lf = LeafFile(os.path.join(state_dir, "leaves"))