Author: stsp
Date: Fri Nov 2 03:12:33 2012
New Revision: 1404864
URL: http://svn.apache.org/viewvc?rev=1404864&view=rev
Log:
* subversion/libsvn_wc/wc_db_wcroot.c
(svn_wc__db_wcroot_parse_local_abspath): If a working copy that requires an
upgrade is found when traversing upwards from a symlink, try to find a
supported working copy where the symlink points to instead.
Fixes the following tests when run within a 1.7 WC:
special_tests.py 19: operate on symlink to wc
special_tests.py 20: svnversion on symlink to wc
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1404864&r1=1404863&r2=1404864&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Fri Nov 2 03:12:33
2012
@@ -670,7 +670,8 @@ try_symlink_as_dir:
sdb, wc_id, FORMAT_FROM_SDB,
db->auto_upgrade, db->enforce_empty_wq,
db->state_pool, scratch_pool);
- if (err && err->apr_err == SVN_ERR_WC_UNSUPPORTED_FORMAT &&
+ if (err && (err->apr_err == SVN_ERR_WC_UNSUPPORTED_FORMAT ||
+ err->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED) &&
kind == svn_kind_symlink)
{
/* We found an unsupported WC after traversing upwards from a
