The unified diff between revisions [4775b468..] and [5db0a3df..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'commands.cc'

#
#
# patch "commands.cc"
#  from [78f143816a40546e5749613deffcbd9717b26b9b]
#    to [b646237c84abb7968c65dd9d7c1868104626f2da]
#
============================================================
--- commands.cc	78f143816a40546e5749613deffcbd9717b26b9b
+++ commands.cc	b646237c84abb7968c65dd9d7c1868104626f2da
@@ -1482,11 +1482,27 @@ CMD(merge, "tree", "", "merge unmerged h
 }


-// fmerge is a simple command for debugging the line merger.  most of the
-// time, leave it commented out. it can be helpful for certain cases,
-// though.
+// float and fmerge are simple commands for debugging the line merger.
+// most of the time, leave them commented out. they can be helpful for certain
+// cases, though.

 /*
+CMD(fload, "tree", "", "load file contents into db")
+{
+  string s = get_stdin();
+  base64< gzip< data > > gzd;
+
+  pack(data(s), gzd);
+
+  file_id f_id;
+  file_data f_data(gzd);
+
+  calculate_ident (f_data, f_id);
+
+  packet_db_writer dbw(app);
+  dbw.consume_file_data(f_id, f_data);
+}
+
 CMD(fmerge, "tree", "<parent> <left> <right>", "merge 3 files and output result")
 {
   if (args.size() != 3)