Index: src/checkin.c ================================================================== --- src/checkin.c +++ src/checkin.c @@ -1706,10 +1706,13 @@ if( nvid==0 ){ fossil_panic("trouble committing manifest: %s", g.zErrMsg); } db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); manifest_crosslink(nvid, &manifest); + assert( blob_is_reset(&manifest) ); + content_deltify(vid, nvid, 0); + zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" " WHERE id=-4"); while( db_step(&q)==SQLITE_ROW ){ const char *zIntegrateUuid = db_column_text(&q, 0); @@ -1726,12 +1729,13 @@ char *zDate; int nrid; blob_zero(&ctrl); zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); + blob_appendf(&ctrl, "C Merge\\s--integrate\\sinto\\s[%S]\n", zUuid); blob_appendf(&ctrl, "D %s\n", zDate); - blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid); + blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid); blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); md5sum_blob(&ctrl, &cksum); blob_appendf(&ctrl, "Z %b\n", &cksum); nrid = content_put(&ctrl); manifest_crosslink(nrid, &ctrl); @@ -1740,13 +1744,10 @@ fossil_print("Closed: %s\n", zIntegrateUuid); } } db_finalize(&q); - assert( blob_is_reset(&manifest) ); - content_deltify(vid, nvid, 0); - zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); fossil_print("New_Version: %s\n", zUuid); if( outputManifest ){ zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); blob_zero(&muuid); blob_appendf(&muuid, "%s\n", zUuid);