You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/12/01 05:00:59 UTC
svn commit: r1642631 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/externals.c
Author: svn-role
Date: Mon Dec 1 04:00:59 2014
New Revision: 1642631
URL: http://svn.apache.org/r1642631
Log:
Merge the 1.7.x-r1641564 branch:
* r1641564
Fix issue 4185: file external not following history.
Justification:
Checkout/update fails, regression from 1.6.
Notes:
Failure was silent, notification occurred but file was not present in wc.
Branch:
^/subversion/branches/1.7.x-r1641564
Votes:
+1: philip, rhuijben, stefan2
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/externals.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-r1641564:r1641574-1642630
Merged /subversion/trunk:r1641564
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1642631&r1=1642630&r2=1642631&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Dec 1 04:00:59 2014
@@ -119,14 +119,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1641564
- Fix issue 4185: file external not following history.
- Justification:
- Checkout/update fails, regression from 1.6.
- Notes:
- Failure was silent, notification occurred but file was not present in wc.
- Branch:
- ^/subversion/branches/1.7.x-r1641564
- Votes:
- +1: philip, rhuijben, stefan2
Modified: subversion/branches/1.7.x/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/externals.c?rev=1642631&r1=1642630&r2=1642631&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/externals.c Mon Dec 1 04:00:59 2014
@@ -464,7 +464,10 @@ switch_file_external(const char *local_a
### information into the wrong working copy */
const char *definition_abspath = svn_dirent_dirname(local_abspath,subpool);
- /* Open an RA session to 'source' URL */
+ /* ### Why do we open a new session? RA_SESSION is a valid
+ ### session -- the caller used it to call svn_ra_check_path on
+ ### this very URL, the caller also did the resolving and
+ ### reparenting that is repeated here. */
SVN_ERR(svn_client__ra_session_from_path(&ra_session, &revnum,
&switch_rev_url,
url, dir_abspath,
@@ -497,7 +500,7 @@ switch_file_external(const char *local_a
/* Tell RA to do an update of URL+TARGET to REVISION; if we pass an
invalid revnum, that means RA will use the latest revision. */
SVN_ERR(svn_ra_do_switch2(ra_session, &reporter, &report_baton, revnum,
- target, svn_depth_unknown, url,
+ target, svn_depth_unknown, switch_rev_url,
switch_editor, switch_baton, subpool));
SVN_ERR(svn_wc__crawl_file_external(ctx->wc_ctx, local_abspath,