Author: danielsh Date: Wed Oct 19 13:01:42 2011 New Revision: 1186183 URL: http://svn.apache.org/viewvc?rev=1186183&view=rev Log: Unnominate the 1.7.x-fs-verify branch.
Modified: subversion/branches/1.7.x/STATUS Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186183&r1=1186182&r2=1186183&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Oct 19 13:01:42 2011 @@ -15,24 +15,6 @@ Status of 1.7.1: Candidate changes: ================== - * r1146131 and followups - Add svn_fs_verify() and implement rep-cache verification in FSFS using it. - Branch: - 1.7.x-fs-verify - Justification: - Would be nice to extend verify already in 1.7.x. - Notes: - This does not include progress reporting; that has been postponed to 1.8. - Conflicts: - On fs_fs.c. Resolve with 'theirs-conflict'. - Votes: - +1: danielsh, rhuijben - +0: gstein (progress would be nice) (without r1161164, r1161180) - -0: cmpilato (For a function with this name, the implementation is far - too anemic. I'd prefer this be a private function in 1.7.x, leaving - room for a future public API that really does full verification.) - (without r1161164, r1161180) - * r1147540, r1147541 Remove unused variables in build system. Justification: @@ -74,5 +56,24 @@ Candidate changes: Veto-blocked changes: ===================== + * r1146131 and followups + Add svn_fs_verify() and implement rep-cache verification in FSFS using it. + Branch: + 1.7.x-fs-verify + Justification: + Would be nice to extend verify already in 1.7.x. + Notes: + This does not include progress reporting; that has been postponed to 1.8. + Conflicts: + On fs_fs.c. Resolve with 'theirs-conflict'. + Votes: + +1: danielsh, rhuijben + +0: gstein (progress would be nice) (without r1161164, r1161180) + -0: cmpilato (For a function with this name, the implementation is far + too anemic. I'd prefer this be a private function in 1.7.x, leaving + room for a future public API that really does full verification.) + (without r1161164, r1161180) + -1: danielsh (invasive, new feature) + Approved changes: =================