You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Senthil Kumaran S <se...@collab.net> on 2009/04/08 13:01:28 UTC
Re: svn commit: r37088 - in trunk/subversion: include libsvn_client
libsvn_wc svn tests/cmdline tests/cmdline/upgrade_tests_data
Hyrum K. Wright wrote:
> Author: hwright
> Date: Tue Apr 7 14:58:02 2009
> New Revision: 37088
>
> Log:
> Move the actual upgrading of working copies from any write operation to
> 'svn cleanup'. If a user attempts to use an old-style working copy, ask
> them to do an explicit cleanup to upgrade.
...
> Modified: trunk/subversion/libsvn_wc/lock.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/lock.c?pathrev=37088&r1=37087&r2=37088
> ==============================================================================
> --- trunk/subversion/libsvn_wc/lock.c Tue Apr 7 14:14:08 2009 (r37087)
> +++ trunk/subversion/libsvn_wc/lock.c Tue Apr 7 14:58:02 2009 (r37088)
> @@ -179,45 +179,31 @@ convert_wcprops(svn_stringbuf_t *log_acc
...
> @@ -423,6 +412,28 @@ probe(const char **dir,
> }
>
>
> +/* Check the format of adm_access, and make sure it's new enough. If it
> + isn't, throw an error explaining how to upgrade. */
> +static svn_error_t *
> +check_format_upgrade(svn_wc_adm_access_t *adm_access,
> + apr_pool_t *scratch_pool)
> +{
> + SVN_ERR(svn_wc__check_format(adm_access->wc_format,
> + adm_access->path,
> + scratch_pool));
> +
> + if (adm_access->wc_format != SVN_WC__VERSION)
> + {
> + return svn_error_createf(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
> + "Working copy format is to old; run "
> + "'svn cleanup' to upgrade");
s/to/too/
> Modified: trunk/subversion/tests/cmdline/upgrade_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/upgrade_tests.py?pathrev=37088&r1=37087&r2=37088
> ==============================================================================
> --- trunk/subversion/tests/cmdline/upgrade_tests.py Tue Apr 7 14:14:08 2009 (r37087)
> +++ trunk/subversion/tests/cmdline/upgrade_tests.py Tue Apr 7 14:58:02 2009 (r37088)
> - expected_stderr = (".*working copy version is to old run 'svn cleanup' "
> + expected_stderr = (".*Working copy format is to old; run 'svn cleanup' "
> "to upgrade")
s/to/too/
> +def upgrade_1_5(sbox):
> + "test upgrading from a 1.5-era working copy"
> +
> + replace_sbox_with_tarfile(sbox, 'upgrade_1_5.tar.bz2')
> +
> + # Attempt to use the working copy, this should give an error
> + expected_stderr = (".*Working copy format is to old; run 'svn cleanup' "
> + "to upgrade")
s/to/too/
--
Senthil Kumaran S
http://www.stylesen.org/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1596152
Re: svn commit: r37088 - in trunk/subversion: include libsvn_client
libsvn_wc svn tests/cmdline tests/cmdline/upgrade_tests_data
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
On Apr 8, 2009, at 8:01 AM, Senthil Kumaran S wrote:
> Hyrum K. Wright wrote:
>> Author: hwright
>> Date: Tue Apr 7 14:58:02 2009
>> New Revision: 37088
>>
>> Log:
>> Move the actual upgrading of working copies from any write
>> operation to
>> 'svn cleanup'. If a user attempts to use an old-style working
>> copy, ask
>> them to do an explicit cleanup to upgrade.
> ...
>> Modified: trunk/subversion/libsvn_wc/lock.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/lock.c?pathrev=37088&r1=37087&r2=37088
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- trunk/subversion/libsvn_wc/lock.c Tue Apr 7 14:14:08 2009
>> (r37087)
>> +++ trunk/subversion/libsvn_wc/lock.c Tue Apr 7 14:58:02 2009
>> (r37088)
>> @@ -179,45 +179,31 @@ convert_wcprops(svn_stringbuf_t *log_acc
> ...
>> @@ -423,6 +412,28 @@ probe(const char **dir,
>> }
>>
>>
>> +/* Check the format of adm_access, and make sure it's new enough.
>> If it
>> + isn't, throw an error explaining how to upgrade. */
>> +static svn_error_t *
>> +check_format_upgrade(svn_wc_adm_access_t *adm_access,
>> + apr_pool_t *scratch_pool)
>> +{
>> + SVN_ERR(svn_wc__check_format(adm_access->wc_format,
>> + adm_access->path,
>> + scratch_pool));
>> +
>> + if (adm_access->wc_format != SVN_WC__VERSION)
>> + {
>> + return svn_error_createf(SVN_ERR_WC_UNSUPPORTED_FORMAT, NULL,
>> + "Working copy format is to old; run "
>> + "'svn cleanup' to upgrade");
>
> s/to/too/
>
>> Modified: trunk/subversion/tests/cmdline/upgrade_tests.py
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/upgrade_tests.py?pathrev=37088&r1=37087&r2=37088
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- trunk/subversion/tests/cmdline/upgrade_tests.py Tue Apr 7
>> 14:14:08 2009 (r37087)
>> +++ trunk/subversion/tests/cmdline/upgrade_tests.py Tue Apr 7
>> 14:58:02 2009 (r37088)
>> - expected_stderr = (".*working copy version is to old run 'svn
>> cleanup' "
>> + expected_stderr = (".*Working copy format is to old; run 'svn
>> cleanup' "
>> "to upgrade")
>
> s/to/too/
>
>> +def upgrade_1_5(sbox):
>> + "test upgrading from a 1.5-era working copy"
>> +
>> + replace_sbox_with_tarfile(sbox, 'upgrade_1_5.tar.bz2')
>> +
>> + # Attempt to use the working copy, this should give an error
>> + expected_stderr = (".*Working copy format is to old; run 'svn
>> cleanup' "
>> + "to upgrade")
>
> s/to/too/
Fixed in r37107.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1599084