You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/05/22 20:57:41 UTC
svn commit: r1485335 - /subversion/branches/1.7.x/STATUS
Author: stsp
Date: Wed May 22 18:57:41 2013
New Revision: 1485335
URL: http://svn.apache.org/r1485335
Log:
* STATUS: Turns out r1426762 doesn't compile when merged as-is, please 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=1485335&r1=1485334&r2=1485335&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 22 18:57:41 2013
@@ -55,6 +55,19 @@ Candidate changes:
-0: rhuijben (Is this needed on this branch?)
+1: stsp, danielsh (as much as it's needed on trunk)
+ * r1426762
+ Fix issue #4283, When the identical suffix starts at chunk boundary, "svn
+ diff" produces incorrect diff.
+ Justification:
+ Without this patch the identical suffix might show up as an added or
+ deleted suffix of a file.
+ Notes:
+ Will probably conflict if r1426752 and/or r1427278 are merged to
+ 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
+ Votes:
+ +1: rhuijben, jcorvel
+ +0: stsp (doesn't compile, undefined reference to `svn_stringbuf_insert')
+
* r1434128, r1434435, r1434476
Fix issue #4034, 'blame on files with non-native eol-style sees every
line as modified'.
@@ -234,18 +247,6 @@ Approved changes:
Votes:
+1: rhuijben, jcorvel, stsp
- * r1426762
- Fix issue #4283, When the identical suffix starts at chunk boundary, "svn
- diff" produces incorrect diff.
- Justification:
- Without this patch the identical suffix might show up as an added or
- deleted suffix of a file.
- Notes:
- Will probably conflict if r1426752 and/or r1427278 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Votes:
- +1: rhuijben, jcorvel, stsp
-
* r1427278
Fix another issue in the diff-libraries whitespace normalization
handling that might make diff show unexpected changes, and even trying