Author: rhuijben
Date: Tue Jun 28 11:14:11 2011
New Revision: 1140524
URL: http://svn.apache.org/viewvc?rev=1140524&view=rev
Log:
* subversion/libsvn_wc/upgrade.c
(upgrade_working_copy): Following up on r1140513, try to handle missing
directories on a few Linux variants.
(Currently upgrade_tests.py 11: missing directories and obstructing files
is ok on Ubuntu, but fails on Debian and Centos)
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1140524&r1=1140523&r2=1140524&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jun 28 11:14:11 2011
@@ -1686,7 +1686,8 @@ upgrade_working_copy(void *parent_baton,
scratch_pool, iterpool);
if (err)
{
- if (APR_STATUS_IS_ENOENT(err->apr_err))
+ if (APR_STATUS_IS_ENOENT(err->apr_err)
+ || SVN__APR_STATUS_IS_ENOTDIR(err->apr_err))
{
/* An unversioned dir is obstructing a versioned dir */
svn_error_clear(err);
