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

[pb...@apache.org]

Author: pburba
Date: Tue Jun 15 18:05:11 2010
New Revision: 954990

URL: http://svn.apache.org/viewvc?rev=954990&view=rev
Log:
* STATUS: Improve justification for r935631.


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=954990&r1=954989&r2=954990&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Jun 15 18:05:11 2010
@@ -109,7 +109,15 @@ Candidate changes:
  * r935631
    Fix one of the sanity checks in the 'svn merge --reintegrate' logic.
    Justification:
-     Sanity checks should themselves be sane.
+     Sanity checks should themselves be sane.  Without this change we are
+     checking that the repository root URL of the reintegrate target is
+     equal to itself, which unsurprisingly it always is :-)
+     Reintegrate merges from foreign repositories do fail without this
+     change, but with the somewhat unhelpful message:
+     "URL '%REINTEGRATE_SOURCE_URL%' is not a child of repository root
+     URL '%REINTEGRATE_TARGET_URL%'".  With this r935631 in place we get
+     a much more helpful error message: "svn: '%REINTEGRATE_SOURCE_URL%' must
+     be from the same repository as 'WC-TARGET-PATH'".
    Branch:
      ^/subversion/branches/1.6.x-r935631
    Votes: