subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1538142 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/externals.c
Date Sat, 02 Nov 2013 04:02:55 GMT
Author: svn-role
Date: Sat Nov  2 04:02:55 2013
New Revision: 1538142

URL: http://svn.apache.org/r1538142
Log:
Merge r1525902 from trunk:

 * r1525902
   Fix issues #4428, #4429: "checkout via http with external pointing at
   redirected URL".
   Justification:
     Such a stupid mistake, to carefully follow the URL redirection just to
     use the unredirected URL subsequently. Breaks externals as soon as the
     repository URL gets redirected.
   Notes:
     I'd be glad to add a regression test, but I'm not entirely clear on how
     to make our test suite model an external to a redirected URL. A testing
     recipe is in issue #4428.
   Votes:
     +1: neels, rhuijben, brane

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_client/externals.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1525902

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1538142&r1=1538141&r2=1538142&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Nov  2 04:02:55 2013
@@ -207,17 +207,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1525902
-   Fix issues #4428, #4429: "checkout via http with external pointing at
-   redirected URL".
-   Justification:
-     Such a stupid mistake, to carefully follow the URL redirection just to
-     use the unredirected URL subsequently. Breaks externals as soon as the
-     repository URL gets redirected.
-   Notes:
-     I'd be glad to add a regression test, but I'm not entirely clear on how
-     to make our test suite model an external to a redirected URL. A testing
-     recipe is in issue #4428.
-   Votes:
-     +1: neels, rhuijben, brane

Modified: subversion/branches/1.8.x/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/externals.c?rev=1538142&r1=1538141&r2=1538142&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/externals.c Sat Nov  2 04:02:55 2013
@@ -737,7 +737,7 @@ handle_external_item_change(svn_client_c
   switch (ext_kind)
     {
       case svn_node_dir:
-        SVN_ERR(switch_dir_external(local_abspath, new_url,
+        SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
                                     &(new_item->peg_revision),
                                     &(new_item->revision),
                                     parent_dir_abspath,



Mime
View raw message