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 2012/02/02 16:20:52 UTC

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

Author: stsp
Date: Thu Feb  2 15:20:52 2012
New Revision: 1239667

URL: http://svn.apache.org/viewvc?rev=1239667&view=rev
Log:
* STATUS: Note the 1.7.x-issue4059 branch.

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=1239667&r1=1239666&r2=1239667&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Feb  2 15:20:52 2012
@@ -93,10 +93,9 @@ Candidate changes:
    grandchild are explicit targets".
    Justification:
      Some copies can't be committed. Users complained.
+   Branch:
+     ^/subversion/1.7.x-issue4059
    Notes:
-     +-----------------------------------+
-     | Merge with --accept=mine-conflict |
-     +-----------------------------------+
      r1146762 avoids a semantic conflict
      r1201419 adds a regression test
      r1227237 is a comment fix