# 
# 
# patch "NEWS"
#  from [d437a51fa6b83ee7c77029364d535602d3d88e28]
#    to [2e3095e6140ecc7faa8d82cdf599244286e71c03]
# 
# patch "UPGRADE"
#  from [d937bff0f8a61653efd71e8322918283efa15660]
#    to [128b39c8de9f33b4763cc69e06baba9ee10b06a2]
# 
============================================================
--- NEWS	d437a51fa6b83ee7c77029364d535602d3d88e28
+++ NEWS	2e3095e6140ecc7faa8d82cdf599244286e71c03
@@ -1,7 +1,16 @@
 ??? ??? ?? ??:??:?? UTC ????
 
         0.33 release.
 
+        Several internal data formats have changed with this release;
+        migration is straight-forward.
+          -- Manifests are completely removed from the database.  To
+	     upgrade your databases, you must run:
+               $ mtn -d mydb.mtn db migrate
+        All of these operations are completely lossless, and 0.33
+        remains compatible with earlier versions with regards to
+        netsync.
+
         Changes
 
         - "mtn ls unknown" no longer recurses into unknown directories.
@@ -20,8 +29,47 @@
           file type attributes) is planned and will be added in a future
           release.
 
+	- update will switch to the branch of a given revision if it
+	  differs from the current workspace branch.
 
+	- use SQLite 3.3.12.
 
+	- schema migrator rebuilt and will now properly detect and report
+	  if the database used is created by a newer monotone than the one
+	  currently used.
+
+	- removed the man page mtn.1, as it hadn't been updated for a long
+	  time.
+
+	New features
+
+	- "mtn merge_into_workspace" (still to be documented)
+
+	- "mtn asciik", a debug command to print the revision graph
+	  in ASCII.
+
+	Other
+
+	- contrib/monotone-mirror.sh and
+	  contrib/monotone-mirror-postaction-update.sh, two scripts
+	  to mirror and update directories automatically.
+
+	- contrib/monotone-run-script-post-netsync.lua, to automatically
+	  update a directory as soon as new revisions or certs arrive for
+	  a given branch.
+
+	- contrib/monotone.bash_completion had some improvemens.
+
+	- contrib/monotone.el had some improvements.
+
+	Internal
+
+	- Internally, the concept of "projects" has been introduced.  It
+	  currently doesn't mean anything, but will be used later, with
+	  policy branches and similar.
+
+
+
 Wed Dec 27 09:57:48 UTC 2006
 
 	0.32 release.
============================================================
--- UPGRADE	d937bff0f8a61653efd71e8322918283efa15660
+++ UPGRADE	128b39c8de9f33b4763cc69e06baba9ee10b06a2
@@ -1,4 +1,4 @@
-upgrading monotone to 0.32
+upgrading monotone to 0.33
 ==========================
 
 How to read this file:
@@ -16,6 +16,10 @@ If you are upgrading from:
     will be described there, not here.
 
 If you are upgrading from:
+  - 0.32 or earlier: The database format has changed.  You must run
+    (after remembering to take a backup copy):
+       $ mtn -d mydb.mtn db migrate
+    on each of your databases.
   - 0.31 or earlier: The database format has changed.  You must run
     (after remembering to take a backup copy):
        $ mtn -d mydb.mtn db migrate