#
#
# patch "NEWS"
#  from [911c3a79166709739a3746d1970b4546177f8cfc]
#    to [7cc34b88b86d57bc8f9759bb7416bd05c2b760e8]
# 
# patch "tester.cc"
#  from [257654ebee4feee833cef70c18fec4481829c567]
#    to [da1589e5c3cc77aa51b5658a71b613e6b1ec64db]
# 
# patch "tests/add_in_subdir/__driver__.lua"
#  from [730c172970f2a479c2d74908beb197a510d1653f]
#    to [6707dd3554af3db376f9539e0b90a02071e47a63]
#
============================================================
--- NEWS	911c3a79166709739a3746d1970b4546177f8cfc
+++ NEWS	7cc34b88b86d57bc8f9759bb7416bd05c2b760e8
@@ -42,17 +42,18 @@
           are better encapsulated now. The database interface has been
           enhanced to ease reduction of locking contention in the future.
 
+        - Merged the two indexes on revision_certs into a single one.
+
         - The database scheme has been changed to store binary encoded hashes,
           instead of a longer hex encoded representation. That reduces the
           database size and speeds up operations a little.
           Users who like to fiddle with the database directly are adviced to
-          use the sqlite function hex() as well as the hexadecimal notation
-          x'DEADBEEF', which emits a binary blob.
+          use the sqlite function hex(), the built-in quote() function as well
+          as the hexadecimal notation x'DEADBEEF'.
 
-        - Monotone uses that same binary hash representation internally as
+        - Monotone now uses that same binary hash representation internally as
           well, saving some conversion steps from and to hex encoded notation.
 
-
 Mon Feb 25 15:55:36 UTC 2008
 
         0.39 release.
@@ -116,16 +117,6 @@ Mon Feb 25 15:55:36 UTC 2008
           directories. The typical case of listing files that need attention
           now runs at least four times faster.
 
-        Internal
-
-        - switched to storing binary sha1 hashes, instead of an ASCII
-          compliant hexadecimal encoding of the hash.
-          The newly added sqlite function unhex(), the built-in quote()
-          function as well as the built-in hex notation (i.e. x'deadbeef')
-          help with handling these binary hashes.
-
-        - merged the two indexes on revision_certs into a single one.
-
         - 'automate get_current_revision' which outputs the revision text of
            changes in the current workspace
 
============================================================
--- tester.cc	257654ebee4feee833cef70c18fec4481829c567
+++ tester.cc	da1589e5c3cc77aa51b5658a71b613e6b1ec64db
@@ -9,8 +9,6 @@
 #include "botan/botan.h"
 #include "botan_pipe_cache.hh"
 #include <boost/lexical_cast.hpp>
-#include <botan/hex.h>
-#include <botan/pipe.h>
 #include <cstring>
 
 #ifdef WIN32
============================================================
--- tests/add_in_subdir/__driver__.lua	730c172970f2a479c2d74908beb197a510d1653f
+++ tests/add_in_subdir/__driver__.lua	6707dd3554af3db376f9539e0b90a02071e47a63
@@ -8,7 +8,7 @@ chdir("subdir")
 
 -- Add a file
 chdir("subdir")
-check(mtn("--debug", "add", "foo"), 0, false, false)
+check(mtn("add", "foo"), 0, false, false)
 -- Add a directory
 check(mtn("add", "-R", "anotherdir"), 0, false, false)
 chdir("..")