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

Posted to commits@subversion.apache.org by ju...@apache.org on 2011/02/17 16:57:56 UTC

svn commit: r1071664 - /subversion/branches/1.6.x/STATUS

Author: julianfoad
Date: Thu Feb 17 15:57:56 2011
New Revision: 1071664

URL: http://svn.apache.org/viewvc?rev=1071664&view=rev
Log:
* STATUS: Mention the backport branch for r880146.

Modified:
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1071664&r1=1071663&r2=1071664&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Feb 17 15:57:56 2011
@@ -224,7 +224,9 @@ Candidate changes:
    interactive callback to the user to resolve the conflicts, unlike the text
    conflicts. Suppress the interactive callback in `--dry-run' mode.
    Justification:
-     Consistency. Simple patch.
+     Consistency. Removes an annoyance. Simple patch.
+   Branch:
+     ^/subversion/branches/1.6.x-r880146
    Votes:
      +1: julianfoad
      -0: stsp (Doesn't merge cleanly. Please create a backport branch.)