Author: svn-role Date: Thu Jan 4 04:00:05 2018 New Revision: 1820031 URL: http://svn.apache.org/viewvc?rev=1820031&view=rev Log: Merge r1819911 from trunk:
* r1819911 Document the WC format used by Subversion 1.10.x. No functional change. Justification: It makes sense to have the correct format documented on the release branch, even if it's only in a private include file. Votes: +1: brane, jamessan, danielsh Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/libsvn_wc/wc.h Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 4 04:00:05 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:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162,1819603 +/subversion/trunk:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162,1819603,1819911 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1820031&r1=1820030&r2=1820031&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jan 4 04:00:05 2018 @@ -75,12 +75,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1819911 - Document the WC format used by Subversion 1.10.x. No functional change. - Justification: - It makes sense to have the correct format documented on the release - branch, even if it's only in a private include file. - Votes: - +1: brane, jamessan, danielsh - Modified: subversion/branches/1.10.x/subversion/libsvn_wc/wc.h URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_wc/wc.h?rev=1820031&r1=1820030&r2=1820031&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/libsvn_wc/wc.h (original) +++ subversion/branches/1.10.x/subversion/libsvn_wc/wc.h Thu Jan 4 04:00:05 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 * * Please document any further format changes here. */