You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/07/25 16:01:31 UTC

svn commit: r1365592 - /subversion/trunk/subversion/libsvn_client/externals.c

Author: rhuijben
Date: Wed Jul 25 14:01:31 2012
New Revision: 1365592

URL: http://svn.apache.org/viewvc?rev=1365592&view=rev
Log:
* subversion/libsvn_client/externals.c
  (switch_file_external): Anchor a file external update on the parent directory
    of the file external instead of the file external itself. While the anchor
    is ignored for just updating a switched file this produces strange/invalid
    urls on the repository side (which should then be ignored). This should fix
    some issues reported against Subversion <=1.4 servers.

Modified:
    subversion/trunk/subversion/libsvn_client/externals.c

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1365592&r1=1365591&r2=1365592&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Wed Jul 25 14:01:31 2012
@@ -436,7 +436,8 @@ switch_file_external(const char *local_a
                                               peg_revision, revision,
                                               ctx, subpool));
 
-    SVN_ERR(svn_ra_reparent(ra_session, url, subpool));
+    SVN_ERR(svn_ra_reparent(ra_session, svn_uri_dirname(url, subpool),
+                            subpool));
 
     SVN_ERR(svn_wc__get_file_external_editor(&switch_editor, &switch_baton,
                                              &revnum, ctx->wc_ctx,