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/03 21:57:39 UTC

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

Author: julianfoad
Date: Thu Feb  3 20:57:39 2011
New Revision: 1066961

URL: http://svn.apache.org/viewvc?rev=1066961&view=rev
Log:
* STATUS: Nominate r880146 for 1.6.x back-port.

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=1066961&r1=1066960&r2=1066961&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Feb  3 20:57:39 2011
@@ -275,6 +275,15 @@ Candidate changes:
    Votes:
      +1: cmpilato
 
+ * r880146
+   When in `--dry-run' mode of `svn merge' command, property conflicts made an
+   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.
+   Votes:
+     +1: julianfoad
+
 Veto-blocked changes:
 =====================