Author: stsp
Date: Sun Nov 27 15:49:49 2011
New Revision: 1206746
URL: http://svn.apache.org/viewvc?rev=1206746&view=rev
Log:
* STATUS: Note additional revs merged into the 1.7.x-issue3991 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=1206746&r1=1206745&r2=1206746&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sun Nov 27 15:49:49 2011
@@ -126,7 +126,7 @@ Candidate changes:
Votes:
+1: stsp
- * r1158923, r1206718 (partly), r1206724
+ * r1158923, r1206718 (partly), r1206724, r1150344, r1158929, r1158929,
r1206741
Fix issue #3991.
Justification:
svn patch is broken for patches not terminated with EOL.
@@ -134,6 +134,10 @@ Candidate changes:
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.
+
Branch:
^/subversion/branches/1.7.x-issue3991
This branch might conflict with the 1.7.x-issue3814 branch (see above).
