Author: stsp
Date: Wed May 15 14:55:52 2013
New Revision: 1482877
URL: http://svn.apache.org/r1482877
Log:
* CHANGES (for 1.8.x): Merge from trunk.
Modified:
subversion/branches/1.8.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.8.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/CHANGES?rev=1482877&r1=1482876&r2=1482877&view=diff
==============================================================================
--- subversion/branches/1.8.x/CHANGES (original)
+++ subversion/branches/1.8.x/CHANGES Wed May 15 14:55:52 2013
@@ -20,7 +20,7 @@ http://svn.apache.org/repos/asf/subversi
* doubled svn:// protocol throughput (r1325899)
* optimize file/dir truename checks on Windows (r1435527)
* new 'commit --include-externals' option (related to issues #1167, #3563)
- * new '--include-externals' option for 'svn list' (issue #4225)
+ * new --include-externals option for 'svn list' (issue #4225)
* remove extraneous externals output from 'svn status -q' (issue #1935)
* reject some attempts to merge between unrelated branches (r1215273)
* new --ignore-properties option for 'svn diff' (r1239553, -617)
@@ -40,7 +40,7 @@ http://svn.apache.org/repos/asf/subversi
* 'svn --version' shows build system info (r1368662)
* 'svn --version --verbose' shows runtime environment info (r1370813 et al)
* 'svn' is now non-interactive when not run in a terminal device (r1424037)
- * 'svn propset' checks spelling of reserved property names.
+ * 'svn propset' checks spelling of reserved property names (r1470781)
* improve working copy performance on network disks (issue #4176)
* support for custom keyword definitions in svn:keywords (issue #890)
* svn:ignore __pycache__ directories by default (r1150073)
@@ -48,14 +48,13 @@ http://svn.apache.org/repos/asf/subversi
* svn:mergeinfo related operations now use much less memory (r1149519 et
al)
* get list of supported schemes for RA libraries (r1148134)
* 'svn checkout' skips file externals from other repositories (r1153110)
- * return an error when conflicts could not be resolved (r1150439)
+ * 'svn resolve' exits non-zero if conflicts could not be resolved
(r1150439)
* let HTTPv2-aware clients fetch v2-style resources (r1161202)
* 'svn status' with better NLS support (r1157537, -682)
* better tracking of shallow-yet-complete merges (issues #4056, #4057)
* make 'svn status --quiet' w/ externals quieter still (issue #1935)
* ensure that conflict paths are shown relative-ized (r1337520)
* improve performance of local multi-target deletions (r1195873)
- * apply update ops to locally moved-away dirs (r1183358, r1185110,
r1185392)
* various interactive conflict resolver improvements in 'svn' (r1440421
etc)
* improved tree diff implementation for diff and merge (r1440599 et al)
* tree conflicts on directories detected better during merges (issue #3150)
@@ -76,7 +75,7 @@ http://svn.apache.org/repos/asf/subversi
* new 'http-max-connections' configuration option for serf (r1421559)
* new 'http-bulk-updates' configuration option for serf (r1421490)
* 'svn cleanup' now runs SQLite "vacuum" to reclaim space (r1418459)
- * 'svn info' displays repository relative URL (r1415365)
+ * 'svn info' displays repository-relative URL (r1415365)
* fix serf memory leak on checkout (issue #4194)
* detect duplicate paths setting svn:externals (issue #4227)
* make ra_serf work over HTTP/1.0 proxies (issue #3979)
@@ -85,7 +84,6 @@ http://svn.apache.org/repos/asf/subversi
* improve network and disk i/o interleaving in ra_serf (r1407934)
* avoid assert in ra_serf when REPORT response was truncated (r1407935)
* rewrite ra_serf XML parser (r1409259 et al)
- * master passphrase and encrypted credentials cache (issue #4145)
* ra_serf can create transaction with inline txnprops (r1375167)
* partially fix replace+propset of locked file fails over DAV (issue #3674)
* fix ra_serf doesn't handle bad baseline error from server (issue #4127)
@@ -94,9 +92,8 @@ http://svn.apache.org/repos/asf/subversi
* ra_serf transmits property changes inline to reduce requests (r1378927)
* allow client to avoid SSL certificate prompts (issue #2410)
* improve interactive resolution of property conflicts (r1387678 et al)
- * 'svn mergeinfo' now prints ASCII-art summary diagram (r1388673 et al)
* make ra_serf raise an error upon delta-base mismatch (issue #4235)
- * tune ra_svn TX buffer handling (r1391788)
+ * tune ra_svn transmit buffer handling (r1391788)
* make 'svnrdump' work with serf (issue #4116)
* fix 'svnrdump' on path below repository root (issue #4101)
@@ -113,7 +110,7 @@ http://svn.apache.org/repos/asf/subversi
* new automatic working copy updater (tools/server-side/svnpubsub)
* new 'svnadmin freeze' subcommand (r1376228)
* 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
- * new '--drop-all-emtpy-revs' option for 'svndumpfilter' (issue #3681)
+ * new --drop-all-emtpy-revs option for 'svndumpfilter' (issue #3681)
* client version info now reported to commit hooks (issue #4124)
* txn name now reported to post-commit hooks (r1240856)
* support for server-side keyword expansion in mod_dav_svn (r1466055)
@@ -126,7 +123,7 @@ http://svn.apache.org/repos/asf/subversi
* 'svnadmin verify' will now check meta data (issues #3956, #4211)
* 'svnadmin verify' now checks for issue #4129 style corruption (r1304656)
* new --client-speed option for svnserve (r1391788)
- * new '--single-threaded' option in svnserve (r1296018)
+ * new --single-threaded option in svnserve (r1296018)
* hook script templates are now marked as executable (r1153414)
* error out on non-canonical fspaths in the authz file (r1166111)
* improve path lookup performance in FSFS (r1442088)
Propchange: subversion/branches/1.8.x/CHANGES
------------------------------------------------------------------------------
Merged /subversion/trunk/CHANGES:r1482841-1482876
