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

[jc...@apache.org]

Author: jcorvel
Date: Wed Jan 16 00:12:00 2013
New Revision: 1433758

URL: http://svn.apache.org/viewvc?rev=1433758&view=rev
Log:
* STATUS: Note that the r1426752, r1426762 and r1427278 backports will
  probably conflict with one another because they all add a test to
  diff-diff3-test.c (specifically, adding lines to the end of its testlist).

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=1433758&r1=1433757&r2=1433758&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jan 16 00:12:00 2013
@@ -108,6 +108,8 @@ Candidate changes:
      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:
@@ -119,6 +121,9 @@ Candidate changes:
    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
 
@@ -153,6 +158,8 @@ Candidate changes:
      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: