=== subversion/libsvn_fs_util/mergeinfo-sqlite-index.c ================================================================== --- subversion/libsvn_fs_util/mergeinfo-sqlite-index.c (revision 148244) +++ subversion/libsvn_fs_util/mergeinfo-sqlite-index.c (local) @@ -164,6 +164,8 @@ const char *db_path = svn_path_join(repos_path, SVN_FS_MERGEINFO__DB_NAME, pool); SQLITE_ERR(sqlite3_open(db_path, db), *db); + /* Retry for 10 seconds when database is busy. */ + SQLITE_ERR(sqlite3_busy_timeout(*db, 10000), *db); #ifdef SQLITE3_DEBUG sqlite3_trace(*db, sqlite_tracer, *db); #endif