Author: svn-role
Date: Wed Apr 15 04:01:08 2015
New Revision: 1673636
URL: http://svn.apache.org/r1673636
Log:
Merge r1673445 from trunk:
* r1673445
Correct the FSFS structure description.
Justification:
Have correct documentation.
Notes:
This is a documentation-only fix and does not require additional
voting.
Votes:
+1: stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/libsvn_fs_fs/structure
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:01:08 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667235,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671388,1672311,1672372,1672404,1672511-1672512,1672728
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667235,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671388,1672311,1672372,1672404,1672511-1672512,1672728,1673445
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1673636&r1=1673635&r2=1673636&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr 15 04:01:08 2015
@@ -235,16 +235,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1673445
- Correct the FSFS structure description.
- Justification:
- Have correct documentation.
- Notes:
- This is a documentation-only fix and does not require additional
- voting.
- Votes:
- +1: stefan2
-
* r1669746
Rename svn_fs_node_same to svn_fs_node_unchanged in FS API.
Justification:
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_fs/structure
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_fs/structure?rev=1673636&r1=1673635&r2=1673636&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_fs/structure (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_fs/structure Wed Apr 15
04:01:08 2015
@@ -578,8 +578,9 @@ defined:
representations may not be handled correctly by SVN before 1.7.20,
1.8.12 and 1.9.0, if they have 0 <size> fields for non-empty contents.
Releases 1.8.0 through 1.8.11 may have falsely created instances of
- that (see issue #4554). Finally, 0 <size> fields are NEVER legal for
- DELTA representations.
+ that (see issue #4554). Finally, 0 <size> fields are only ever legal
+ for DELTA representations if the reconstructed full-text is actually
+ empty.
The predecessor of a node-rev crosses both soft and true copies;
together with the count field, it allows efficient determination of
