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:52:31 UTC
svn commit: r1485334 - /subversion/branches/1.7.x/STATUS
Author: stsp
Date: Wed May 22 18:52:31 2013
New Revision: 1485334
URL: http://svn.apache.org/r1485334
Log:
* STATUS (for 1.7.x): Vote, approving fixes for libsvn_diff.
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=1485334&r1=1485333&r2=1485334&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 22 18:52:31 2013
@@ -55,63 +55,6 @@ Candidate changes:
-0: rhuijben (Is this needed on this branch?)
+1: stsp, danielsh (as much as it's needed on trunk)
- * r1426752
- Fix Issue #4133, an issue in the diff-libraries whitespace normalization
- handling that might make diff use the wrong tokens, showing up as
- unexpected changes.
- Justification:
- The diff library should behave properly when suppressing whitespace
- changes.
- Notes:
- The branch is just needed for avoiding a conflict with the testcase.
- Will probably conflict again if r1426762 and/or r1427278 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Branch:
- ^/subversion/branches/1.7.x-r1426752
- Votes:
- +1: rhuijben, jcorvel
-
- * 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
-
- * r1427278
- Fix another issue in the diff-libraries whitespace normalization
- handling that might make diff show unexpected changes, and even trying
- to read beyond end of file.
- Justification:
- The diff library should behave properly when suppressing whitespace
- changes. See also http://svn.haxx.se/dev/archive-2012-12/0556.shtml
- for some examples of this bug.
- Notes:
- The branch is just needed for avoiding a conflict with adding a comment.
- Will probably conflict again if r1426752 and/or r1426762 are merged to
- 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
- Branch:
- ^/subversion/branches/1.7.x-r1427278
- Votes:
- +1: jcorvel, rhuijben
-
- * 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, rhuijben
-
* r1434128, r1434435, r1434476
Fix issue #4034, 'blame on files with non-native eol-style sees every
line as modified'.
@@ -274,3 +217,60 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r1426752
+ Fix Issue #4133, an issue in the diff-libraries whitespace normalization
+ handling that might make diff use the wrong tokens, showing up as
+ unexpected changes.
+ Justification:
+ The diff library should behave properly when suppressing whitespace
+ changes.
+ Notes:
+ The branch is just needed for avoiding a conflict with the testcase.
+ Will probably conflict again if r1426762 and/or r1427278 are merged to
+ 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
+ Branch:
+ ^/subversion/branches/1.7.x-r1426752
+ 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
+ to read beyond end of file.
+ Justification:
+ The diff library should behave properly when suppressing whitespace
+ changes. See also http://svn.haxx.se/dev/archive-2012-12/0556.shtml
+ for some examples of this bug.
+ Notes:
+ The branch is just needed for avoiding a conflict with adding a comment.
+ Will probably conflict again if r1426752 and/or r1426762 are merged to
+ 1.7.x, because they all add a test to the testlist in diff-diff3-test.c.
+ Branch:
+ ^/subversion/branches/1.7.x-r1427278
+ Votes:
+ +1: jcorvel, rhuijben, stsp
+
+ * 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, rhuijben, stsp