#
#
# patch "cmd_scgi.cc"
#  from [c35d9cb42306191a437dbd2def99c484d3e85181]
#    to [5a5a2d9288e6506b6d6d7c3afbbe19e587e7aa83]
# 
# patch "gsync.cc"
#  from [9c924a220189dd0b77a4ef2548002acd573c99cc]
#    to [2fe15a794fc2956289fb0397051607fec89ea736]
# 
# patch "json_msgs.cc"
#  from [a0600541e56367b0803ad6deec4828b394afc2e9]
#    to [a2358398a8ac5c553e0693efbba21881745be452]
#
============================================================
--- cmd_scgi.cc	c35d9cb42306191a437dbd2def99c484d3e85181
+++ cmd_scgi.cc	5a5a2d9288e6506b6d6d7c3afbbe19e587e7aa83
@@ -218,8 +218,7 @@ do_cmd(database & db, json_io::json_obje
       revision_id check;
       calculate_ident(rev, check);
       I(rid == check);
-      //db.put_revision(rid, rev);
-      // if put fails, encode the reason in the response
+      db.put_revision(rid, rev); // FIXME: handle various return values
       return encode_msg_put_rev_response();
     }
   else if (decode_msg_get_file_data_request(cmd_obj, fid))
@@ -230,7 +229,7 @@ do_cmd(database & db, json_io::json_obje
   else if (decode_msg_put_file_data_request(cmd_obj, fid, data))
     {
       // this will check that the id is correct
-      // db.put_file(fid, data);
+      db.put_file(fid, data);
       return encode_msg_put_file_data_response();
     }
   else if (decode_msg_get_file_delta_request(cmd_obj, old_id, new_id))
@@ -243,7 +242,7 @@ do_cmd(database & db, json_io::json_obje
       // this should also check that the delta applied to the data with old_id
       // produces data that matches the new_id. currently it looks like the database
       // does not enforce this though, so FIXME!
-      // db.put_file_version(old_id, new_id, delta);
+      db.put_file_version(old_id, new_id, delta);
       return encode_msg_put_file_delta_response();
     }
   else
============================================================
--- gsync.cc	9c924a220189dd0b77a4ef2548002acd573c99cc
+++ gsync.cc	2fe15a794fc2956289fb0397051607fec89ea736
@@ -251,10 +251,11 @@ pull_revs(database & db,
        i != inbound_revs.end(); ++i)
     {
       revision_t rev;
-      rev.made_for = made_for_database;
       ch.pull_rev(*i, rev);
       ++rev_ticker;
 
+      transaction_guard guard(db);
+
       for (edge_map::const_iterator e = rev.edges.begin();
            e != rev.edges.end(); ++e)
         {
============================================================
--- json_msgs.cc	a0600541e56367b0803ad6deec4828b394afc2e9
+++ json_msgs.cc	a2358398a8ac5c553e0693efbba21881745be452
@@ -460,6 +460,7 @@ decode_rev(query q, revision_t & rev)
       decode_cset(changes, *cs);
       rev.edges.insert(make_pair(revision_id(old_revision), cs));
     }
+  rev.made_for = made_for_database;
 }
 
 /////////////////////////////////////////////////////////////////////