Author: philip
Date: Tue Nov 25 11:06:48 2014
New Revision: 1641571
URL: http://svn.apache.org/r1641571
Log:
Merge r1641564 and resolve conflict in externals_tests.py.
Modified:
subversion/branches/1.8.x-r1641564/ (props changed)
subversion/branches/1.8.x-r1641564/subversion/libsvn_client/externals.c
subversion/branches/1.8.x-r1641564/subversion/tests/cmdline/externals_tests.py
Propchange: subversion/branches/1.8.x-r1641564/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1641564
Modified:
subversion/branches/1.8.x-r1641564/subversion/libsvn_client/externals.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1641564/subversion/libsvn_client/externals.c?rev=1641571&r1=1641570&r2=1641571&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1641564/subversion/libsvn_client/externals.c
(original)
+++ subversion/branches/1.8.x-r1641564/subversion/libsvn_client/externals.c Tue
Nov 25 11:06:48 2014
@@ -460,7 +460,10 @@ switch_file_external(const char *local_a
svn_dirent_split(&dir_abspath, &target, local_abspath, scratch_pool);
- /* 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_path2(&ra_session, &switch_loc,
url, dir_abspath,
peg_revision, revision,
@@ -497,7 +500,7 @@ switch_file_external(const char *local_a
invalid revnum, that means RA will use the latest revision. */
SVN_ERR(svn_ra_do_switch3(ra_session, &reporter, &report_baton,
switch_loc->rev,
- target, svn_depth_unknown, url,
+ target, svn_depth_unknown, switch_loc->url,
FALSE /* send_copyfrom */,
TRUE /* ignore_ancestry */,
switch_editor, switch_baton,
Modified:
subversion/branches/1.8.x-r1641564/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1641564/subversion/tests/cmdline/externals_tests.py?rev=1641571&r1=1641570&r2=1641571&view=diff
==============================================================================
---
subversion/branches/1.8.x-r1641564/subversion/tests/cmdline/externals_tests.py
(original)
+++
subversion/branches/1.8.x-r1641564/subversion/tests/cmdline/externals_tests.py
Tue Nov 25 11:06:48 2014
@@ -3163,6 +3163,7 @@ def pinned_externals(sbox):
# The interesting values
'Z/old-plain' : Item(contents="This is the file 'mu'.\n"),
'Z/new-plain' : Item(contents="This is the file 'mu'.\n"),
+ 'Z/new-rev' : Item(contents="This is the file 'mu'.\n"),
# And verifying X
'X/D/H/psi' : Item(contents="This is the file 'psi'.\n"),
