subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1207514 - /subversion/branches/1.7.x/STATUS
Date Mon, 28 Nov 2011 19:11:40 GMT
Author: stsp
Date: Mon Nov 28 19:11:39 2011
New Revision: 1207514

URL: http://svn.apache.org/viewvc?rev=1207514&view=rev
Log:
* STATUS: Nominate the combined issue #3814 and #3991 fix instead of
   individual fixes. The fixes overlap.

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=1207514&r1=1207513&r2=1207514&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Nov 28 19:11:39 2011
@@ -50,41 +50,31 @@ Candidate changes:
    Votes:
      +1: philip, cmpilato
    
- * r1166267, r1206576, r1206718, r1206719 
-   Fix issue #3814.
+ * r1150344, r1158923, r1158929, r1166267, r1206576, r1206718, r1206719,
+   r1206724,r1206741
+   Fix issues #3814 and #3991.
    Justification:
-     svn patch is broken for property values not terminated with EOL.
-     Fix requested on users@:
+     svn patch is broken for file content and property values not terminated
+     with EOL, and for patches not terminated with EOL.
+     Fixes requested on users@:
      http://svn.haxx.se/users/archive-2011-11/0513.shtml
+     http://svn.haxx.se/users/archive-2011-11/0523.shtml
    Notes:
+     r1150344: Merged to avoid conflicts in diff parsing test.
+     r1158923: Adds a cmdline regression test for issue #3991.
+     r1158929: Adds a new C diff parsing regression test for issue #3991.
      r1166267: Merged to prevent conflicts in diff_tests.py.
      r1206576: Tweak 'svn diff' output for prop values not terminated with EOL.
      r1206718: Fix issue #3814.
      r1206719: Follow-up fix for JavaHL tests.
-   Branch:
-     ^/subversion/branches/1.7.x-issue3814.
-     This branch might conflict with the 1.7.x-issue3991 branch (see below).
-     I will tweak this nomination if the other branch is reintegrated.
-   Votes:
-     +1: stsp, philip
-
- * r1158923, r1206718 (partly), r1206724, r1150344, r1158929, r1206741
-   Fix issue #3991.
-   Justification:
-     svn patch is broken for patches not terminated with EOL.
-   Notes:
-     r1158923: Adds a regression test.
-     r1206718: Change to libsvn_client/patch.c is needed for issue #3991 fix.
      r1206724: Fix issue #3991.
-     r1150344: Merged to avoid conflicts in diff parsing test.
-     r1158929: Adds a new diff parsing regression test.
-     r1206741: Fixes the test to make it PASS.
+     r1206741: Fixes the #3991 C diff parsing test to make it PASS.
+     r1206748: Remove an obsolete comment.
    Branch:
-     ^/subversion/branches/1.7.x-issue3991
-     This branch might conflict with the 1.7.x-issue3814 branch (see above).
-     I will tweak this nomination if the other branch is reintegrated.
+     ^/subversion/branches/1.7.x-svn-patch-eol-fixes
    Votes:
      +1: stsp
+     +1: philip (r1166267, r1206576, r1206718, r1206719 only)
 
 
 Veto-blocked changes:



Mime
View raw message