# # patch "database.cc" # from [db6ff3f54bf294ab40735e2aba41c57381408e10] # to [f443fb17f9bc64e8889080ed3f70a7d89c9bc008] # # patch "database.hh" # from [af2a926539d042f61e97180730ad348ad2181bcd] # to [4806c0f3cf48989a3df847d54c82425cce89828e] # # patch "revision.cc" # from [f17c0a13c50015509aa893f47e72ffbc0c9b1c12] # to [e7c650b9e5bab6ac9a813dc30ed3a2128b0aa78d] # ======================================================================== --- database.cc db6ff3f54bf294ab40735e2aba41c57381408e10 +++ database.cc f443fb17f9bc64e8889080ed3f70a7d89c9bc008 @@ -1432,6 +1432,13 @@ execute("DELETE FROM revision_certs"); } +void +database::delete_existing_manifests() +{ + execute("DELETE FROM manifests"); + execute("DELETE FROM manifest_deltas"); +} + /// Deletes one revision from the local database. /// @see kill_rev_locally void ======================================================================== --- database.hh af2a926539d042f61e97180730ad348ad2181bcd +++ database.hh 4806c0f3cf48989a3df847d54c82425cce89828e @@ -309,6 +309,8 @@ void delete_existing_revs_and_certs(); + void delete_existing_manifests(); + void delete_existing_rev_and_certs(revision_id const & rid); void delete_branch_named(cert_value const & branch); ======================================================================== --- revision.cc f17c0a13c50015509aa893f47e72ffbc0c9b1c12 +++ revision.cc e7c650b9e5bab6ac9a813dc30ed3a2128b0aa78d @@ -759,6 +759,8 @@ app.db.delete_existing_revs_and_certs(); construct_revisions_from_ancestry(); write_certs(); + if (existing_graph) + app.db.delete_existing_manifests(); guard.commit(); } }