# 
# patch "ChangeLog"
#  from [b9eba3e198740478f7533dcc80d7c9df9ab8be60]
#    to [c357fc0eef58e7efb9a987ae2be4aa799261bf3f]
# 
# patch "NEWS"
#  from [542138ab98bf754cb1b2f2d86652f9abf2b438e3]
#    to [412bb443772db09ff7dd1ce53414fc98bd90bb5c]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-07-05  Nathaniel Smith  <address@hidden>
+
+	* NEWS: First cut at 0.20 release notes.
+
 2005-07-03  Matthew Gregan  <address@hidden>
 
 	* sqlite/*, Makefile.am: Import SQLite 3.2.2 from upstream.
--- NEWS
+++ NEWS
@@ -1,3 +1,92 @@
+????????????????????????????
+
+        0.20 release.  features, ui improvements, performance
+        improvements, and bug fixes.
+
+        - major changes in netsync UI: serve/sync/push/pull now take a
+          list of globs; clients can request arbitrary sets of
+          branches, not just predefined "collections".  write
+          permissions are now granted on a per-db level (they were
+          before anyway).
+                - where you used to say, e.g., "monotone pull
+                  net.venge.monotone", you should instead say
+                  "monotone pull net.venge.monotone*".  This may
+                  require shell-quoting.
+                - 'get_netsync_write_permitted' hooks must be changed
+                  to take only one argument, the 'identity'.
+                  'get_netsync_{read,anonymous_read}_permitted' hooks
+                  now take a branch argument instead of a collection,
+                  and will be called for each branch that a client
+                  requests.
+                - 0.19 clients cannot talk to 0.20 servers, and vice-versa.
+                - special thanks to Timothy Brownawell
+                  <address@hidden>, Richard Levitte
+                  <address@hidden>.
+        - other major changes:
+                - cvs_import re-written; many bugs fixed.  now
+                  supports tags.
+        - many minor netsync changes:
+                - netsync traffic is now cryptographically authenticated
+                  against corruption and man-in-the-middle attacks.
+                  special thanks to Ethan Blanton <address@hidden>,
+                  Matt Johnston <address@hidden>.
+                - new hooks that are called when server receives data:
+                  note_netsync_*_received.  special thanks to Timothy
+                  Brownawell <address@hidden>.
+                - ancestry graphs that pass outside the given branch
+                  are now synchronized correctly.  special thanks to
+                  Timothy Brownawell <address@hidden>.
+        - UI improvements:
+                - 'log' options changed: --depth has become --last;
+                  new options --no-merges, --diffs, --brief.
+                - 'status' has new option --brief.  special thanks to
+                  Derek Scherger <address@hidden>.
+                - 'serve' has new option --pid-file.  special thanks
+                  to Matthew Gregan <address@hidden>.
+                - all commands taking restrictions now take option
+                  --depth, to limit recursion through subdirectories.
+                  special thanks to Joel Reed <address@hidden>.
+                - merge command all take --author, --date now.
+                - 'checkout', 'update' take --revision, instead of
+                  using positional arguments.  special thanks to Derek
+                  Scherger <address@hidden>, Richard Levitte
+                  <address@hidden>.
+                - 'commit' takes new --message-file option.
+        - new features:
+                - new commands: "db kill_branch_locally", "db
+                  kill_revision_locally", useful for correcting some
+                  mistakes.  special thanks to Brian Campbell
+                  <address@hidden>, Sebastian Spaeth
+                  <address@hidden>.
+                - new file attribute 'manual_merge', to prevent invocation of
+                  merger on binary files.  hook added to guess correct
+                  value at 'add' time.  special thanks to Riccardo
+                  Ghetta <address@hidden>.
+                - new 'earlier than', 'later than' selectors.  special
+                  thanks to Riccardo Ghetta <address@hidden>.
+        - new automate commands:
+                - 'stdio', for efficient use by
+                  front-ends.  special thanks to Timothy Brownawell
+                  <address@hidden>.
+                - 'select', for requesting the set of revisions
+                  matching a selector.  special thanks to Richard
+                  Levitte <address@hidden>.
+                - 'certs', for fetching certs on a revision in a
+                  parseable (basic io-based) format.  special thanks
+                  to Grahame Bowland <address@hidden>.
+                - 'inventory' output changed incompatibly; should be
+                  much more usable now, and stable.  special thanks to
+                  Derek Scherger <address@hidden>.
+        - better memory/performance when handling large files.
+          special thanks to Eric Anderson
+          <address@hidden>, Timothy Brownawell
+          <address@hidden>, Matt Johnston <address@hidden>,
+          Matthew Gregan <address@hidden>.
+        - new text mode browser in contrib/mtbrowse.sh, by Henry
+          Nestler <address@hidden>.
+        - improved zsh completion in contrib/monotone.zsh_completion,
+          by Joel Reed <address@hidden>.
+
 Tue May  3 00:31:37 PDT 2005
 
         0.19 release.  performance improvements, features, ui