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

Posted to commits@subversion.apache.org by cm...@apache.org on 2010/06/29 19:27:52 UTC

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

Author: cmpilato
Date: Tue Jun 29 17:27:51 2010
New Revision: 959049

URL: http://svn.apache.org/viewvc?rev=959049&view=rev
Log:
Propose r959004 for backport.

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=959049&r1=959048&r2=959049&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Jun 29 17:27:51 2010
@@ -148,6 +148,15 @@ Candidate changes:
    Votes:
      +1: pburba
 
+ * r959004
+   Make 'svn' raise an error when the --reintegrate flag is supplied to a
+   2-URL merge (which isn't a supported use-case).
+   Justification:
+     Currently, the --reintegrate option is silently ignored, which has
+     led to at last one confused user.
+   Votes:
+     +1: cmpilato
+
 Veto-blocked changes:
 =====================