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

Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/26 11:41:17 UTC

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

Author: rhuijben
Date: Fri Aug 26 09:41:17 2011
New Revision: 1162047

URL: http://svn.apache.org/viewvc?rev=1162047&view=rev
Log:
* STATUS: Note whitespace conflict on merging

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=1162047&r1=1162046&r2=1162047&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug 26 09:41:17 2011
@@ -82,6 +82,9 @@ Candidate changes:
    Notes:
      r1162024 is a test reproducing the segfault. r1162033 fixes both issues
      and possibly a few harder to reproduce variants.
+     There is a trivial text conflict on the blank line above the newly added
+     test. An empty line was removed in r1151015, theirs-on-conflict handles
+     this properly.
    Votes:
      +1: rhuijben, danielsh