You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by jc...@apache.org on 2013/01/16 00:55:50 UTC

svn commit: r1433749 - /subversion/branches/1.7.x/STATUS

Author: jcorvel
Date: Tue Jan 15 23:55:50 2013
New Revision: 1433749

URL: http://svn.apache.org/viewvc?rev=1433749&view=rev
Log:
* STATUS: Nominate r1427197, r1427210 (fixes for issue#4270
  'diff -cN shows wrong line changed') for 1.7.x.

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=1433749&r1=1433748&r2=1433749&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Jan 15 23:55:50 2013
@@ -158,6 +158,18 @@ Candidate changes:
    Votes:
      +1: jcorvel
 
+ * r1427197, r1427210
+   Fix issue #4270 'diff -cN shows wrong line changed'.  In the optimized
+   code path (unaligned access) for prefix/suffix scanning, the diff would
+   be incorrect when a '\r' is not immediately followed by a '\n'.
+   Justification:
+     Diff should show the correct changes. Failure to do so can lead to
+     incorrect updates/merges (because diff3 suffers from the same bug).
+   Branch:
+     ^/subversion/branches/1.7.x-issue4270
+   Votes:
+     +1: jcorvel
+
 Veto-blocked changes:
 =====================