#
#
# patch "NEWS"
# from [b9034e67e73f60163830996df6020058d77a332c]
# to [2a454ac2be99bd1e41b43efa64fcd6ade95ba4b9]
#
# patch "UPGRADE"
# from [6052a50d43bd883a92d73daa17b0ec2909b6448a]
# to [80d9904903a527e11b8c6ab9f095e440fddea8eb]
#
# patch "docs/Automation.html"
# from [6b134ea5f3c2d82793b95327288d0ce8aea0bb62]
# to [b6eccdddffeb81a4f343b55fc43aabb33e45c03f]
#
# patch "docs/Default-hooks.html"
# from [426d6f8d291d2c1b66af91f7fc541cb4322b4c71]
# to [99892ddc48e8c728b6b1959b1d0e51ffbd5ce69e]
#
# patch "docs/Key-and-Cert-Trust.html"
# from [9a87d94eb16d0d44085edd2bd8339648e42aaa5b]
# to [fe3c48ac5de701bce5ad94b1efa8cfc1db1fd7a8]
#
# patch "docs/Other-Transports.html"
# from [4a0047e6f6556a6314755fad17c23408979235f1]
# to [910d073c89285a29d1a7e64acdd89e22e9bb763a]
#
# patch "docs/Selectors.html"
# from [27ff2f3960012335a26dfe8f355773418e1bb9ac]
# to [b10a322c7a643b71e36c803fca49fecacb266bfd]
#
# patch "monotone.html"
# from [f3620d6af7b59c2c8e08e80e473c8298b5f9dc95]
# to [c75053c40e42a8bdf7899495223b00f2d5d2e41a]
#
# patch "monotone.pdf"
# from [af9abc648e45e83c487d06ff496493b96517cf7d]
# to [1b1d863f21f30d0d15b9f49aa5f7b7a1adbc62c6]
#
============================================================
--- NEWS b9034e67e73f60163830996df6020058d77a332c
+++ NEWS 2a454ac2be99bd1e41b43efa64fcd6ade95ba4b9
@@ -1,3 +1,68 @@
+Fri Apr 11 22:50:44 UTC 2008
+
+ 0.40 release.
+
+ Changes
+
+ - The vim merger has been improved and now uses diff3 to merge
+ non-conflict changes automatically before executing vimdiff.
+
+ - Values used with the --depth option used to control recursion with
+ node and path restrictions have changed. Using --depth=0 now means
+ exactly the specified directories and *not* their children. Using
+ --depth=1 now means the specified directories and their immediate
+ children. Previously --depth=0 included children and --depth=1
+ included grandchildren and it was not possible to exclude children
+ using --depth. The simple fix for anyone using --depth is to add 1 to
+ the values they are using.
+
+ - Document that ssh: and file: sync transports are not supported on
+ native Win32.
+
+ Bugs fixed
+
+ - `commit' now uses keydir specified in _MTN/options
+
+ - duplicate name conflicts now show a proper error message, even if
+ a parent directory got renamed as well. In that case, the error
+ message now shows both names for the directory and the offending
+ file name.
+
+ New features
+
+ - The bare parent selector 'p:' can now be used in a workspace to
+ query the parent(s) of the workspace' base revision. This is
+ equivalent to "mtn au select p:`mtn au get_base_workspace_revision`".
+
+ - push, pull, and sync can be run with a single argument, which looks
+ like
+ mtn://hostname?include_pattenr/-exclude_pattern
+ or
+ mtn://hostname?include=include_pattern/exclude=exclude_pattern
+
+ Internal
+
+ - Update Botan to 1.7.4.
+
+ - Usage of the internal app_state object has been reduced, objects
+ are better encapsulated now. The database interface has been
+ enhanced to ease reduction of locking contention in the future.
+
+ - Merged the two indexes on revision_certs into a single one.
+
+ - The database schema has been changed so that it now stores
+ binary SHA1 hashes rather than their hexadecimal encoding,
+ in most places where these are used. This reduces the
+ database size and speeds up operations a little.
+
+ Users who like to fiddle with the database directly are
+ advised to use the sqlite functions hex() and quote() to
+ print columns that store hashes (including IDs), and the
+ hexadecimal literal notation x'DEADBEEF' to input them.
+
+ - Binary SHA1 hashes are also used for most in-memory
+ processing, avoiding conversions and saving memory.
+
Mon Feb 25 15:55:36 UTC 2008
0.39 release.
@@ -27,7 +92,7 @@ Mon Feb 25 15:55:36 UTC 2008
If you use the '--with-system-pcre' configure switch, it
will insist on at least this version.
- - "emacs" has been removed from the list of dumb terminal types;
+ - "emacs" has been removed from the list of dumb terminal types;
tickers should now default to --ticker=count with emacs terminals
- extensive section on merge conflicts and ways to resolve them
@@ -41,13 +106,13 @@ Mon Feb 25 15:55:36 UTC 2008
- the path handling of 'mtn revert' was improved and fixed two bugs:
now a restricted revert on a node "dir1/file1" reverts only the
content changes in "file1", but leaves renames of any of its
- ancestor nodes untouched; furthermore, if "dir0/" was renamed to
+ ancestor nodes untouched; furthermore, if "dir0/" was renamed to
"dir1" and "dir1/file1" was dropped, mtn now re-creates file1 at the
proper place ("dir1/") and leaves no missing files around because
of the non-existing "dir0/".
- a few changes needed to build with gcc 4.3.
-
+
New features
- 'automate drop_db_variables' which drops one database variable
@@ -61,9 +126,9 @@ Mon Feb 25 15:55:36 UTC 2008
directories. The typical case of listing files that need attention
now runs at least four times faster.
- - 'automate get_current_revision' which outputs the revision text of
+ - 'automate get_current_revision' which outputs the revision text of
changes in the current workspace
-
+
Wed Dec 12 21:21:15 UTC 2007
0.38 release.
============================================================
--- UPGRADE 6052a50d43bd883a92d73daa17b0ec2909b6448a
+++ UPGRADE 80d9904903a527e11b8c6ab9f095e440fddea8eb
@@ -1,4 +1,4 @@
-upgrading monotone to 0.39
+upgrading monotone to 0.40
==========================
How to read this file:
@@ -16,7 +16,7 @@ If you are upgrading from:
will be described there, not here.
If you are upgrading from:
- - 0.33 or earlier: The database format has changed. You must run
+ - 0.39 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.
============================================================
--- docs/Automation.html 6b134ea5f3c2d82793b95327288d0ce8aea0bb62
+++ docs/Automation.html b6eccdddffeb81a4f343b55fc43aabb33e45c03f
@@ -583,7 +583,7 @@ A file path.
A file path.