# 
# patch "ChangeLog"
#  from [5b85ee85684e387ff169390de122f5d1c77f6b09]
#    to [369e3b3a2565f2338c5b1cba2dca8bde16b221ab]
# 
# patch "NEWS"
#  from [26074f3b24d60dd3b432055525f7721d25443373]
#    to [d7ff94f7f5ac027ec5dec5fab54b8f12b18fe5b3]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-07-16  Nathaniel Smith  <address@hidden>
 
+	* NEWS: Update for 0.21.
+
+2005-07-16  Nathaniel Smith  <address@hidden>
+
 	* database.cc (assert_sqlite3_ok): Remove dead function.
 	
 2005-07-16  Nathaniel Smith  <address@hidden>
--- NEWS
+++ NEWS
@@ -1,3 +1,39 @@
+????????????????????????????
+
+        0.21 release.  bug fixes, performance improvements, and ui
+        improvements.
+
+        - fixes a number of major performance bugs in 0.20's netsync
+          implementation.  special thanks to Matt Johnston
+          <address@hidden>.
+        - fixes a number of major bugs in 0.20's (rewritten)
+          cvs_import command.
+        - configury kluges to work around g++ 4.0/boost 1.32
+          incompatibilities.  special thanks to Christof Petig
+          <address@hidden>, Matthew Gregan
+          <address@hidden>, Jordan Breeding
+          <address@hidden>.
+        - new netsync options:
+          - "--exclude": branches are included if
+            they match any of the given globs, unless they match any
+            of the given --exclude globs.  special thanks to Timothy
+            Brownawell <address@hidden>.
+          - "--set-default": makes it easy to change default
+            server/branches.
+        - b: and t: selectors now match exactly, instead of matching
+          as substrings.  globbing is supported for inexact matching.
+          special thanks to Brian Downing <address@hidden>, Jordan
+          Breeding <address@hidden>.
+        - use sqlite3 prepared statements.  special thanks to Derek
+          Scherger <address@hidden>.
+        - 'db migrate' is now a complete no-op if there is no
+          migration to do; automated scripts can now call it
+          optimistically and cheaply to guarantee up-to-dateness.
+        - new command 'db kill_tag_locally'.  special thanks to Jordan
+          Breeding <address@hidden>.
+        - new hash correctness tests.  special thanks to Kaushik
+          Veeraraghavan <address@hidden>.
+
 Tue Jul  5 23:57:10 PDT 2005
 
         0.20 release.  features, ui improvements, performance