[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r36302 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 4 Mar 2009 13:19:40 +0100

The format problem will happen to you for any working copy checked out
by a client including r35701:

------------------------------------------------------------------------
r35701 | hwright | 2009-02-05 20:41:42 +0100 (Thu, 05 Feb 2009) | 14 lines

Don't create the format file in the the WC administrative area. This file
has been deprecated since 1.4, and only existed as a nicety for ancient working
copies.

* subversion/libsvn_wc/adm_files.c
  (init_adm): Don't create the format file.

* subversion/libsvn_wc/README:
  Update documentation regarding the format file.

* subversion/libsvn_wc/log.c
  (log_do_upgrade_format): In place of rewriting the format file, just remove
    it.

------------------------------------------------------------------------

On Wed, Mar 4, 2009 at 13:16, Greg Stein <gstein_at_gmail.com> wrote:
> Stefan ran into a problem with the auto-upgrade process. He had a
> working copy without .svn/format files. All of mine did... so at some
> (recent) point we were still creating them and the auto-upgrade
> "worked for me". But... failed for him.
>
> If this happens to you:
>
> $ touch subversion/libsvn_wc/.svn/format
> $ svn up subversion/libsvn_wc  # to pick up r36302
> $ make
> $ svn up
>
> you could also do:
>
> $ for i in `find . -name .svn` ; do touch $i/.svn/format ; done
> $ svn up
>
> Cheers,
> -g
>
> On Wed, Mar 4, 2009 at 13:13, Greg Stein <gstein_at_gmail.com> wrote:
>> Author: gstein
>> Date: Wed Mar  4 04:13:04 2009
>> New Revision: 36302
>>
>> Log:
>> Fix a small problem in the loggy upgrade process. Some v10 working copies
>> have .svn/format, and some don't. The *intent* is to remove the file if
>> present, so make the code match.
>>
>> * subversion/libsvn_wc/log.c:
>>  (log_do_upgrade_format): ignore errors from the file removal
>>
>> Modified:
>>   trunk/subversion/libsvn_wc/log.c
>>
>> Modified: trunk/subversion/libsvn_wc/log.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/log.c?pathrev=36302&r1=36301&r2=36302
>> ==============================================================================
>> --- trunk/subversion/libsvn_wc/log.c    Wed Mar  4 04:07:22 2009        (r36301)
>> +++ trunk/subversion/libsvn_wc/log.c    Wed Mar  4 04:13:04 2009        (r36302)
>> @@ -1473,7 +1473,7 @@ log_do_upgrade_format(struct log_runner
>>                             _("Invalid 'format' attribute"));
>>
>>   /* Remove the .svn/format file, if it exists. */
>> -  SVN_ERR(svn_io_remove_file(path, loggy->pool));
>> +  svn_error_clear(svn_io_remove_file(path, loggy->pool));
>>
>>   /* The nice thing is that, just by setting this flag, the entries file will
>>      be rewritten in the desired format. */
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1266516
>>
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1266526
Received on 2009-03-04 13:19:54 CET

This is an archived mail posted to the Subversion Dev mailing list.