> -----Original Message-----
> From: neels_at_apache.org [mailto:neels_at_apache.org]
> Sent: donderdag 22 september 2011 21:38
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1174342 - in /subversion/trunk/subversion:
> include/private/svn_wc_private.h libsvn_client/cleanup.c
> libsvn_wc/upgrade.c libsvn_wc/wc_db.c libsvn_wc/wc_db.h
>
> Author: neels
> Date: Thu Sep 22 19:38:09 2011
> New Revision: 1174342
>
> URL: http://svn.apache.org/viewvc?rev=1174342&view=rev
> Log:
> Issue #4016. Try to find proper URL information on externals during upgrade.
> Do this after the entire upgrade ran through, as repository information is
> easiest to obtain after all the rest has been upgraded.
>
> (This might obsolete some parts of the existing externals prop upgrade code.
> But removing is for another patch, and might just be micro-optimization.)
>
> * subversion/libsvn_client/cleanup.c
> (svn_client_upgrade):
> Fetch all URL and revisions information from upgraded externals' working
> copies, or from fetch_repos_info() if not checked out yet. This properly
> populates the EXTERNALS table rows for upgraded externals of all kinds.
> Furthermore, change error handling in the externals upgrade loop so that
> one externals failure does not abort upgrade of other externals.
>
> * subversion/include/private/svn_wc_private.h,
> * subversion/libsvn_wc/upgrade.c
> (svn_wc__upgrade_add_external_info): New function.
>
> * subversion/libsvn_wc/wc_db.h,
> * subversion/libsvn_wc/wc_db.c
> (svn_wc__db_upgrade_insert_external): New function.
I'm not sure if this problem is really caused by this commit, but upgrade_tests.py 2 is currently still failing on Windows:
FAIL: upgrade_tests.py 2: upgrade with externals
The interesting lines are:
svn: warning: W200000: Error handling externals definition for 'svn-test-work\working_copies\upgrade_tests-2\A\D\exdir_A\G':
svn: warning: W180001: Unable to connect to a repository at URL 'file://tmp/repo.other/A/D/G'
Where 'file://tmp/repo.other/A/D/G' is interpreted as '\\tmp\repo.other\A\D\G' on Windows and is not canonical on *nix.
Bert
Received on 2011-09-26 23:49:12 CEST