Author: stsp Date: Mon Nov 28 22:44:01 2011 New Revision: 1207673 URL: http://svn.apache.org/viewvc?rev=1207673&view=rev Log: * STATUS: Re-nominate the 1.7.x-svn-patch-eol-fixes 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=1207673&r1=1207672&r2=1207673&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Mon Nov 28 22:44:01 2011 @@ -43,32 +43,9 @@ Candidate changes: Votes: +1: stsp - -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) - * r1150344, r1158923, r1158929, r1166267, r1206576, r1206718, r1206719, - r1206724, r1206741 - Fix issues #3814 and #3991. + r1206724, r1206741, r1207656, r1207663 + Fix issues #3814, and #3991, and other EOL-handling problems in patch. Justification: svn patch is broken for file content and property values not terminated with EOL, and for patches not terminated with EOL. @@ -86,17 +63,36 @@ Veto-blocked changes: r1206724: Fix issue #3991. r1206741: Fixes the #3991 C diff parsing test to make it PASS. r1206748: Remove an obsolete comment. + r1207656: Fix a pointer dereference bug from r1206718. + r1207663: Fix handling of '\ No newline ...' comments within hunk text. Branch: ^/subversion/branches/1.7.x-svn-patch-eol-fixes Votes: + +1: stsp +1: philip (r1166267, r1206576, r1206718, r1206719 only) - -1: stsp (Problem in implementation: It assumes comments like - '\ No newline at end of file' terminate the entire hunk text, - but in fact they terminate the original/modified versions of - the hunk text, see example patch file at - http://svn.haxx.se/users/archive-2011-11/0523.shtml - which has two '\ No newline at ...' comments) +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: =================