Author: stsp
Date: Sun Nov 27 15:27:36 2011
New Revision: 1206732

URL: http://svn.apache.org/viewvc?rev=1206732&view=rev
Log:
* STATUS: Nominate #3991 fix.

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=1206732&r1=1206731&r2=1206732&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sun Nov 27 15:27:36 2011
@@ -115,15 +115,33 @@ Candidate changes:
      Fix requested on users@:
      http://svn.haxx.se/users/archive-2011-11/0513.shtml
    Notes:
-    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.
+     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
 
+ * r1158923, r1206718 (partly), r1206724
+   Fix issue #3991.
+   Justification:
+     svn patch is broken for patches not 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.
+   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.
+   Votes:
+     +1: stsp
+
+
 Veto-blocked changes:
 =====================
 


Reply via email to