# 
# 
# patch "app_state.cc"
#  from [3384797a5b4c8538bb2815051f9c9e5492b1a803]
#    to [f822fba65f5a53f435ed83ce59890f0a0853e04d]
# 
# patch "automate.cc"
#  from [e7926f73bc7cf89503f22a165db3e77ef29eff6f]
#    to [9744e787de2a1cb295eba30ce082b6c58949f4c5]
# 
# patch "basic_io.cc"
#  from [6e6babfdc814a224d16a28748222f7ba164893e5]
#    to [29ba1f17a572a153697b70bc3e5c22904011d2c6]
# 
# patch "basic_io.hh"
#  from [4ab584b2a1ad4af5748d9a4d8fc07a45511fa9f9]
#    to [0b2e48ab437ab4d2c66ef412fa2328ead6c84d19]
# 
# patch "cmd_automate.cc"
#  from [cd359f474386a86ab988cfda2faa672806113bde]
#    to [e12603be6bc143481838551267a3748354b2a876]
# 
# patch "cmd_db.cc"
#  from [c259cad883ed10a503f8fa10e5e067eded90916c]
#    to [54d30842895c736e1f2e71c63b6577935002cd98]
# 
# patch "cmd_diff_log.cc"
#  from [e2385e1ed0749bc39b3ec537e74156b726e19359]
#    to [93e294302364e65679bbb809273fb7d3208541b0]
# 
# patch "cmd_files.cc"
#  from [a311f7223155de82028d82e410d92b1f18ef30c4]
#    to [112a24126bea86d32a5e563a9207296bf5cba97c]
# 
# patch "cmd_key_cert.cc"
#  from [9c2cb74b31e99c3d4eabdb7f19f399379a9d5abc]
#    to [3b5637f1674cfffbf1048bde42f666da7c3163db]
# 
# patch "cmd_list.cc"
#  from [e3b9fe24c7b0aa279113cfbc2fe6ad504013e2dc]
#    to [5a80aa9fb82b10d989597d3b3c1b9177f8725073]
# 
# patch "cmd_merging.cc"
#  from [b528cf9fdc6617ffe96e0109874478eca0297186]
#    to [4d2247118dc8e6d757be9a86f8ebd4eed7322322]
# 
# patch "cmd_packet.cc"
#  from [3b90d96d799871f9d05f2717b092338500812750]
#    to [7f7e42fa66a1f0594d53372599b332960ab06808]
# 
# patch "cmd_ws_commit.cc"
#  from [f20c1f57eaf7cdbd7122d3a72f76f9ee85ae1673]
#    to [24e80266274e9952ae7734c1c10ce099365e0b3c]
# 
# patch "diff_patch.cc"
#  from [efa59b899d706e7bfdd2b3cca433eed5ebf844bb]
#    to [05abac4db33a6942b39833e2f75c3dacb3222250]
# 
# patch "diff_patch.hh"
#  from [304204467c83bbf6a4e0563dbd25efbcba96f1ae]
#    to [e1d0a668ab9072a5db4551f7b557befc843eb8bd]
# 
# patch "inodeprint.cc"
#  from [9c3963b93fb6ba7736654c2f67c92dde49fe146a]
#    to [7b40801a0c24b79e31875a985b2b657fcef408ae]
# 
# patch "keys.cc"
#  from [4a058060b5a56df134ca3c1d418b810c644712bd]
#    to [0da3d3d300eb96edc50758f49b8383fc8fb18f8d]
# 
# patch "lcs.cc"
#  from [835685931f26ed15b6587bbeb1c19ebbf2d5bf56]
#    to [959d45c33b49c9cc0be495e4a556d25d52a8dd8b]
# 
# patch "merkle_tree.cc"
#  from [6b8dba1c330871b6f44eeefcaa4f3de1efe1cb6f]
#    to [d508737f2f16ecc274ad032fd07de8fdb3cc4204]
# 
# patch "monotone.cc"
#  from [eb5b5c41da9e81aad0ffb91818c016a5628e85d9]
#    to [78453eea6f4d8796e0c0a181d6a8a91f1e0b8248]
# 
# patch "packet.cc"
#  from [321c141f57b042254693ac087ad31b7c13d8f6f8]
#    to [878c9142ecd2955dc1fd5c4a7fca4baff910db85]
# 
# patch "paths.cc"
#  from [9c1d54440bc37827f23b33f5e275406748320384]
#    to [b3236290f60db16bce0208445270f5043213d6e4]
# 
# patch "rcs_file.cc"
#  from [fe17ed7854a347fe0998167fd80e54cea935ceb3]
#    to [b6331f4c720ee5894b90f599df7d1e8be2502cda]
# 
# patch "rcs_import.cc"
#  from [bd306d490d071237ee799494c623ec73dade5b06]
#    to [06415479a87c0d212fade497f1fb982283e0d83d]
# 
# patch "revision.cc"
#  from [19dcc24d7b030f67d63819674d1e218c95c77cf0]
#    to [993b5f1f83f737bdffe63f69044f8a87ce8b8631]
# 
# patch "sanity.cc"
#  from [895be1df0de7918edb6fbb72f4f06f5428c38c9a]
#    to [9fd3709f9f2dd5417339d9fb966577618ad63123]
# 
# patch "sanity.hh"
#  from [23f0b45dc863b712e1614e5fa464c13cfd3dcc8d]
#    to [951ca81383d05b993b47eabd193ed463da4c7d86]
# 
# patch "sha1.cc"
#  from [bd41a7d36643b0e492bec889c7c5bf3acebb9091]
#    to [aa27d3e16300ee842b3531913f2548c84b50c6b4]
# 
# patch "smap.hh"
#  from [3d8318df0f37640a2614f5512c879f4618e84706]
#    to [bf9bd78d9e317a89f27f5cecaa0aafff8007b6b0]
# 
# patch "string_queue.cc"
#  from [9f9b2784d472e90307d3b249f1fc487911268373]
#    to [efa027721a9185785b0e59e74b09e5e6c9ea9054]
# 
# patch "tester.cc"
#  from [79708fba492d9cd05cc0749ac95d4db73965fba1]
#    to [92f084120ecb09cf0c92c3f291070cfe250a88b8]
# 
# patch "vocab.cc"
#  from [24ee8f825c4e592cc473c51b1c135246142ce40d]
#    to [3fb4739ee7c9703642bf2e73345d70f6bedf90b2]
# 
# patch "work.cc"
#  from [acd01b0e2f90e17d8ecdb8a5192c447d7a9cfebd]
#    to [df6c5e971c7110070e18dee3466a5d026d499f4c]
# 
============================================================
--- app_state.cc	3384797a5b4c8538bb2815051f9c9e5492b1a803
+++ app_state.cc	f822fba65f5a53f435ed83ce59890f0a0853e04d
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <cstdlib>              // for strtoul()
-#include <iostream>
 #include <string>
 #include <vector>
 
============================================================
--- automate.cc	e7926f73bc7cf89503f22a165db3e77ef29eff6f
+++ automate.cc	9744e787de2a1cb295eba30ce082b6c58949f4c5
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <algorithm>
-#include <iostream>
 #include <iterator>
 #include <sstream>
 #include <string>
============================================================
--- basic_io.cc	6e6babfdc814a224d16a28748222f7ba164893e5
+++ basic_io.cc	29ba1f17a572a153697b70bc3e5c22904011d2c6
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <sstream>
 #include <string>
 #include <cctype>
============================================================
--- basic_io.hh	4ab584b2a1ad4af5748d9a4d8fc07a45511fa9f9
+++ basic_io.hh	0b2e48ab437ab4d2c66ef412fa2328ead6c84d19
@@ -11,7 +11,6 @@
 // PURPOSE.
 
 
-#include <cstdio>
 #include <iosfwd>
 #include <string>
 #include <vector>
============================================================
--- cmd_automate.cc	cd359f474386a86ab988cfda2faa672806113bde
+++ cmd_automate.cc	e12603be6bc143481838551267a3748354b2a876
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <iosfwd>
-#include <iostream>
 #include <map>
 
 #include "cmd.hh"
============================================================
--- cmd_db.cc	c259cad883ed10a503f8fa10e5e067eded90916c
+++ cmd_db.cc	54d30842895c736e1f2e71c63b6577935002cd98
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <utility>
 
 #include "charset.hh"
============================================================
--- cmd_diff_log.cc	e2385e1ed0749bc39b3ec537e74156b726e19359
+++ cmd_diff_log.cc	93e294302364e65679bbb809273fb7d3208541b0
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <deque>
-#include <iostream>
 #include <map>
 #include <sstream>
 #include <queue>
============================================================
--- cmd_files.cc	a311f7223155de82028d82e410d92b1f18ef30c4
+++ cmd_files.cc	112a24126bea86d32a5e563a9207296bf5cba97c
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 
 #include "annotate.hh"
 #include "cmd.hh"
============================================================
--- cmd_key_cert.cc	9c2cb74b31e99c3d4eabdb7f19f399379a9d5abc
+++ cmd_key_cert.cc	3b5637f1674cfffbf1048bde42f666da7c3163db
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <sstream>
-#include <iostream>
 
 #include "cert.hh"
 #include "charset.hh"
============================================================
--- cmd_list.cc	e3b9fe24c7b0aa279113cfbc2fe6ad504013e2dc
+++ cmd_list.cc	5a80aa9fb82b10d989597d3b3c1b9177f8725073
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <algorithm>
-#include <iostream>
 #include <map>
 #include <utility>
 
============================================================
--- cmd_merging.cc	b528cf9fdc6617ffe96e0109874478eca0297186
+++ cmd_merging.cc	4d2247118dc8e6d757be9a86f8ebd4eed7322322
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <cstring>
 
 #include "cmd.hh"
============================================================
--- cmd_packet.cc	3b90d96d799871f9d05f2717b092338500812750
+++ cmd_packet.cc	7f7e42fa66a1f0594d53372599b332960ab06808
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <sstream>
-#include <iostream>
 
 #include "cmd.hh"
 #include "packet.hh"
============================================================
--- cmd_ws_commit.cc	f20c1f57eaf7cdbd7122d3a72f76f9ee85ae1673
+++ cmd_ws_commit.cc	24e80266274e9952ae7734c1c10ce099365e0b3c
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <map>
 
 #include "cmd.hh"
============================================================
--- diff_patch.cc	efa59b899d706e7bfdd2b3cca433eed5ebf844bb
+++ diff_patch.cc	05abac4db33a6942b39833e2f75c3dacb3222250
@@ -10,7 +10,6 @@
 #include "config.h"
 
 #include <algorithm>
-#include <iostream>
 #include <iterator>
 #include <map>
 #include <string>
============================================================
--- diff_patch.hh	304204467c83bbf6a4e0563dbd25efbcba96f1ae
+++ diff_patch.hh	e1d0a668ab9072a5db4551f7b557befc843eb8bd
@@ -16,7 +16,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <iostream>
 #include <map>
 #include <string>
 #include <vector>
============================================================
--- inodeprint.cc	9c3963b93fb6ba7736654c2f67c92dde49fe146a
+++ inodeprint.cc	7b40801a0c24b79e31875a985b2b657fcef408ae
@@ -10,7 +10,6 @@
 #include <string>
 #include <iterator>
 #include <sstream>
-#include <iostream>
 #include <algorithm>
 #include <iterator>
 
============================================================
--- keys.cc	4a058060b5a56df134ca3c1d418b810c644712bd
+++ keys.cc	0da3d3d300eb96edc50758f49b8383fc8fb18f8d
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <string>
 #include <map>
 
============================================================
--- lcs.cc	835685931f26ed15b6587bbeb1c19ebbf2d5bf56
+++ lcs.cc	959d45c33b49c9cc0be495e4a556d25d52a8dd8b
@@ -39,7 +39,6 @@
 */
 
 #include <algorithm>
-#include <iostream>
 #include <vector>
 
 #include "lcs.hh"
============================================================
--- merkle_tree.cc	6b8dba1c330871b6f44eeefcaa4f3de1efe1cb6f
+++ merkle_tree.cc	d508737f2f16ecc274ad032fd07de8fdb3cc4204
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <map>
 #include <string>
 #include <sstream>
============================================================
--- monotone.cc	eb5b5c41da9e81aad0ffb91818c016a5628e85d9
+++ monotone.cc	78453eea6f4d8796e0c0a181d6a8a91f1e0b8248
@@ -9,9 +9,7 @@
 
 #include "config.h"
 
-#include <cstdio>
 #include <iterator>
-#include <iostream>
 #include <fstream>
 #include <sstream>
 #include <locale.h>
============================================================
--- packet.cc	321c141f57b042254693ac087ad31b7c13d8f6f8
+++ packet.cc	878c9142ecd2955dc1fd5c4a7fca4baff910db85
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <string>
 
 #include <boost/regex.hpp>
============================================================
--- paths.cc	9c1d54440bc37827f23b33f5e275406748320384
+++ paths.cc	b3236290f60db16bce0208445270f5043213d6e4
@@ -7,7 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <iostream>
 #include <string>
 #include <sstream>
 
============================================================
--- rcs_file.cc	fe17ed7854a347fe0998167fd80e54cea935ceb3
+++ rcs_file.cc	b6331f4c720ee5894b90f599df7d1e8be2502cda
@@ -10,7 +10,6 @@
 #include "config.h"
 
 #include <fstream>
-#include <iostream>
 #include <string>
 #include <vector>
 
@@ -33,8 +32,6 @@
 #include "rcs_file.hh"
 #include "sanity.hh"
 
-#include <cstdio>
-
 using std::ifstream;
 using std::ios_base;
 using std::istream;
============================================================
--- rcs_import.cc	bd306d490d071237ee799494c623ec73dade5b06
+++ rcs_import.cc	06415479a87c0d212fade497f1fb982283e0d83d
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <algorithm>
-#include <iostream>
 #include <iterator>
 #include <list>
 #include <map>
@@ -20,7 +19,6 @@
 #include <vector>
 
 #include <unistd.h>
-#include <cstdio>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
============================================================
--- revision.cc	19dcc24d7b030f67d63819674d1e218c95c77cf0
+++ revision.cc	993b5f1f83f737bdffe63f69044f8a87ce8b8631
@@ -9,7 +9,6 @@
 
 #include <cctype>
 #include <cstdlib>
-#include <iostream>
 #include <map>
 #include <queue>
 #include <set>
============================================================
--- sanity.cc	895be1df0de7918edb6fbb72f4f06f5428c38c9a
+++ sanity.cc	9fd3709f9f2dd5417339d9fb966577618ad63123
@@ -7,9 +7,6 @@
 // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.
 
-#include <stdio.h>
-#include <stdarg.h>
-
 #include <algorithm>
 #include <iterator>
 #include <iostream>
@@ -328,6 +325,18 @@ dump(string const & obj, string & out)
   out = obj;
 }
 
+void
+print_var(std::string const & value, char const * var,
+          char const * file, int const line, char const * func)
+{
+  std::cout << (FL("----- begin '%s' (in %s, at %s:%d)\n") 
+                % var % func % file % line)
+            << value
+            << (FL("\n-----   end '%s' (in %s, at %s:%d)\n") 
+                % var % func % file % line)
+            << std::endl;
+}
+
 void MusingBase::gasp_head(string & out) const
 {
   out = (boost::format("----- begin '%s' (in %s, at %s:%d)\n")
============================================================
--- sanity.hh	23f0b45dc863b712e1614e5fa464c13cfd3dcc8d
+++ sanity.hh	951ca81383d05b993b47eabd193ed463da4c7d86
@@ -13,7 +13,6 @@
 #include "config.h" // Required for ENABLE_NLS
 
 #include <iosfwd>
-#include <iostream>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -503,17 +502,19 @@ template <> void dump(std::string const 
 
 // debugging utility to dump out vars like MM but without requiring a crash
 
+extern void print_var(std::string const & value,
+                      std::string const & var,
+                      char const * file,
+                      int const line,
+                      char const * func);
+
 template <typename T> void
-dump(T const & t, std::string var, 
-     std::string const & file, int const line, std::string const & func)
+dump(T const & t, char const *var,
+     char const * file, int const line, char const * func)
 {
-  std::string out;
-  dump(t, out);
-  std::cout << (FL("----- begin '%s' (in %s, at %s:%d)") 
-                % var % func % file % line) << std::endl
-            << out << std::endl
-            << (FL("-----   end '%s' (in %s, at %s:%d)") 
-                % var % func % file % line) << std::endl << std::endl;
+  std::string value;
+  dump(t, value);
+  print_var(value, var, file, line, func);
 };
 
 #define DUMP(foo) dump(foo, #foo, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION)
============================================================
--- sha1.cc	bd41a7d36643b0e492bec889c7c5bf3acebb9091
+++ sha1.cc	aa27d3e16300ee842b3531913f2548c84b50c6b4
@@ -12,7 +12,6 @@
 
 #include <string>
 #include <map>
-#include <iostream>
 #include <botan/engine.h>
 #include <botan/libstate.h>
 
============================================================
--- smap.hh	3d8318df0f37640a2614f5512c879f4618e84706
+++ smap.hh	bf9bd78d9e317a89f27f5cecaa0aafff8007b6b0
@@ -14,7 +14,6 @@
 #include <numeric>
 #include <vector>
 
-#include <iostream>
 
 // this is a map that works by storing a sorted vector and doing binary
 // search.  for maps that are filled once and then used many times, it is
============================================================
--- string_queue.cc	9f9b2784d472e90307d3b249f1fc487911268373
+++ string_queue.cc	efa027721a9185785b0e59e74b09e5e6c9ea9054
@@ -6,7 +6,6 @@
 
 #ifdef BUILD_UNIT_TESTS
 
-#include <iostream>
 #include "unit_tests.hh"
 
 using std::logic_error;
============================================================
--- tester.cc	79708fba492d9cd05cc0749ac95d4db73965fba1
+++ tester.cc	92f084120ecb09cf0c92c3f291070cfe250a88b8
@@ -7,7 +7,6 @@
 #include "platform.hh"
 #include "sanity.hh"
 
-#include <cstdio>
 #include <stdlib.h>
 
 #include <exception>
============================================================
--- vocab.cc	24ee8f825c4e592cc473c51b1c135246142ce40d
+++ vocab.cc	3fb4739ee7c9703642bf2e73345d70f6bedf90b2
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <string>
-#include <iostream>
 
 #include "constants.hh"
 #include "hash_map.hh"
============================================================
--- work.cc	acd01b0e2f90e17d8ecdb8a5192c447d7a9cfebd
+++ work.cc	df6c5e971c7110070e18dee3466a5d026d499f4c
@@ -8,7 +8,6 @@
 // PURPOSE.
 
 #include <sstream>
-#include <cstdio>
 #include <cstring>
 #include <cerrno>
 #include <queue>