# 
# 
# patch "NEWS"
#  from [9ffccb0de7d0575dd3dc5c35b7f9058ed9de0e8b]
#    to [5dceaa33fe301bc7691615adb4c32b4bdc2c5b2b]
# 
# patch "UPGRADE"
#  from [1ad00a312e8b35f2f3b65836a79c426c4e1c4963]
#    to [03b9ba7f568e282f75394096310d2abc15e3ccd3]
# 
============================================================
--- NEWS	9ffccb0de7d0575dd3dc5c35b7f9058ed9de0e8b
+++ NEWS	5dceaa33fe301bc7691615adb4c32b4bdc2c5b2b
@@ -1,33 +1,37 @@
 Sun Jan  8 01:08:56 PST 2006
 
-        0.26pre1 release.
+        0.26pre1 release.  Massive rewrites, released for shakedown.
+        This release is also dedicated to Shweta Narayan.
 
-        This release includes massive changes compared to 0.25; the
+        This release includes massive changes compared to 0.25.  The
         core versioning code has all been replaced with a completely
-        different mechanism.  If you have been following the
-        development list for the last few months, you may have heard
-        about "rosters" -- this is the name for the new core data
-        structure we use.  While the code is completely different, the
-        user experience should not be very different.  You will never
-        see a roster, unless you are debugging monotone itself;
-        everything still revolves around revisions, manifests, and
-        certs.
+        different mechanism.  Data formats and the netsync protocol
+        have changed in incompatible ways.
 
-        While this new code has extensive tests, it has never been
-        used for real work.  The purpose of this release is to make a
-        version available for the monotone developers to begin using
-        for day-to-day work, to shake out bugs.
+        Migration to 0.26pre1 or later is irreversible and requires a
+        flag day for your project.  See UPGRADE for details.  Note
+        that we DO NOT recommend upgrading at this time; see below.
 
-        Let's say that again in caps: THIS CODE IS PROBABLY BUGGY, DO
-        NOT USE IT UNLESS YOU WANT TO BE A DAREDEVIL.
+        If you have been following the development list for the last
+        few months, you may have heard about "rosters" -- this is the
+        name for the new core data structure we use.  While the code
+        is completely different, the user experience should not be
+        very different.  You will never see a roster, unless you are
+        debugging monotone itself; everything still revolves around
+        revisions, manifests, and certs.
 
-        Data formats and the netsync protocol have changed in
-        incompatible ways.  Migration to 0.26pre1 or later is
-        irreversible and requires a flag day for your project.  See
-        UPGRADE for details.
+        While this new code has extensive tests, because of these
+        incompatibilities, it has never been used for real work.  The
+        purpose of this release is to make a version available for the
+        monotone developers to begin using for day-to-day work, to
+        shake out bugs.
 
-        Testing of this version on real databases is a good idea, and
-        we'd very much appreciate hearing about your experiences.
+        Let's say that again in caps: THIS CODE IS PROBABLY BUGGY, DO
+        NOT USE IT IN PRODUCTION UNLESS YOU WANT TO BE A DAREDEVIL.
+        
+        However, testing of this version with real databases is a good
+        idea, and we'd very much appreciate hearing about your
+        experiences.
 
         Some of the many changes:
         - New textual format for revisions and manifests.  They remain
@@ -49,10 +53,6 @@
         - 100% fewer change_set.cc related bugs.  100% more roster.cc
           related bugs.  But, the idea of touching roster.cc does not
           terrify people.
-          - Example: if anyone wants to implement merge into
-            working directory (the interface to merging that most
-            systems use), this was previously prohibitively
-            complicated, but is now quite a straightforward task.
 
 Thu Dec 29 23:10:03 PST 2005
 
============================================================
--- UPGRADE	1ad00a312e8b35f2f3b65836a79c426c4e1c4963
+++ UPGRADE	03b9ba7f568e282f75394096310d2abc15e3ccd3
@@ -1,18 +1,18 @@
 upgrading monotone to 0.26pre1
 ==============================
 
 if you are upgrading from:
   - 0.25 or earlier: we have modified the textual format of revisions
-    and manifests.  Your project must rebuild its history; this is
-    irreversible and creates a flag day.  You should probably do some
-    test migrations locally first to make sure everything seems to be
-    working, before running your real migration.  To run the real
-    migration:
+    and manifests.  See NEWS before upgrading.  Your project must
+    rebuild its history; this is irreversible and creates a flag day.
+    You should probably do some test migrations locally first to make
+    sure everything seems to be working, before running your real
+    migration.  To run the real migration:
       1) get everyone to commit and push their changes to the server;
          local dbs and working copies will be broken by this
          migration.
       2) shut down the server
-      3) make a backup copy of the server db
+      3) run 'cp server.db server.db.backup'
       4) run 'monotone db migrate --db server.db'
       5) run 'monotone db rosterify --db server.db'
       6) do whatever tests you like to make sure things look reasonable