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=1266522
Received on 2009-03-04 13:17:12 CET