Author: brane
Date: Tue Jan 2 23:54:24 2018
New Revision: 1819916
URL: http://svn.apache.org/viewvc?rev=1819916&view=rev
Log:
On the better-pristines branch: Sync with trunk up to r1819915.
Modified:
subversion/branches/better-pristines/ (props changed)
subversion/branches/better-pristines/subversion/libsvn_wc/wc.h
Propchange: subversion/branches/better-pristines/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 2 23:54:24 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1807118-1819868
+/subversion/trunk:1807118-1819915
Modified: subversion/branches/better-pristines/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/better-pristines/subversion/libsvn_wc/wc.h?rev=1819916&r1=1819915&r2=1819916&view=diff
==============================================================================
--- subversion/branches/better-pristines/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/better-pristines/subversion/libsvn_wc/wc.h Tue Jan 2
23:54:24 2018
@@ -159,6 +159,7 @@ extern "C" {
*
* == 1.8.x shipped with format 31
* == 1.9.x shipped with format 31
+ * == 1.10.x shipped with format 31
*
* The bump to 32 added support for compressed pristines and pristine storage
* within the working copy database.
