# 
# 
# patch "ChangeLog"
#  from [9db6a7ef69afbce9b8e915455f82a8be359c5842]
#    to [85537329347a9be795a51d1fff4a9f6a1b8997b9]
# 
# patch "NEWS"
#  from [112d26a960169d8b6a649c1823c97531a702cf41]
#    to [b7ce6d5deee730cd93db2b250704facc8a4583ba]
# 
============================================================
--- ChangeLog	9db6a7ef69afbce9b8e915455f82a8be359c5842
+++ ChangeLog	85537329347a9be795a51d1fff4a9f6a1b8997b9
@@ -1,3 +1,7 @@
+2006-02-11  Nathaniel Smith  <address@hidden>
+
+	* NEWS: Draft for 0.26pre2.
+
 2006-02-11  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Adapt translation to the newly changed messages.
============================================================
--- NEWS	112d26a960169d8b6a649c1823c97531a702cf41
+++ NEWS	b7ce6d5deee730cd93db2b250704facc8a4583ba
@@ -1,7 +1,15 @@
 ????????????????????????????
-        x.yz release.  This is where we write a short summary of the changes
-        for this release.
 
+        0.26pre2 release.  Inching towards 0.26.  If you are using
+        0.25 or earlier, then make sure to read the very important
+        notes for 0.26pre1, below.  In particular, like 0.26pre1, this
+        is a pre-release for testing.  Do not package it.  DO NOT USE
+        THIS RELEASE UNLESS YOU WANT TO BE A DAREDEVIL.
+
+        (Though, in fact, in a month of usage, only one bug has been
+        found in the new history code, and it was both minor and
+        harmless.  It has additionally been fixed.)
+
         Database changes:
 
         - SQLite 3.3.3 has been imported.  3.3 introduces a new database
@@ -9,8 +17,43 @@
           New databases will be created using this new format.  Existing
           databases remain compatible, and are not converted automatically.
           Existing databases can be converted by performing a database
-          vacuum.
+          vacuum ('monotone db execute vacuum').
 
+        UI improvements:
+
+        - rename (and mv) commands now accept a broader range of
+          syntax:
+            monotone rename foo some_dir
+              -> renames foo to foo/some_dir
+            monotone rename foo bar baz some_dir
+              -> moves foo, bar, and baz to some_dir/foo,
+                 some_dir/bar, and some_dir/baz
+        - Print a warning if it looks like a user has made a quoting
+          mistake on push/pull/sync/serve (windows cmd.exe has
+          confusing rules here).
+        - New command "ls changed".
+        - New option "--next" to log, which displays descendents of
+          the start revision.
+        - Updating to an arbitrary revision now works again (as it did
+          in 0.25 and earlier).  This allows one to, for instance,
+          switch a working copy to another head, or back up to an
+          earlier version, while preserving uncommitted changes.
+        - New option --brief to annotate, gives somewhat more friendly
+          output.
+        - Fixed bug that made ticker output from netsync inaccurate.
+        - In 'log', --no-merges is now the default, use --merges to
+          override.
+
+        Other:
+        - Better detection when users have not run "rosterify", and
+          more helpful suggestions on what to do in this case.
+        - Documentation, translation, error message,
+          etc. improvements.
+        - Updates to contrib/mtbrowse.sh, simple shell-based monotone
+          interface.
+        - Updates to many other contrib/ files, mostly to maintain
+          compatibility with monotone changes.
+
 Sun Jan  8 01:08:56 PST 2006
 
         0.26pre1 release.  Massive rewrites, released for shakedown.