You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/10/02 01:13:45 UTC
Re: svn commit: r39740 - in trunk/subversion: libsvn_wc
tests/cmdline tests/cmdline/svntest tests/libsvn_wc
On Thu, Oct 1, 2009 at 11:17, Hyrum K. Wright <hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/lock.c Thu Oct 1 08:17:49 2009 (r39740)
>...
> @@ -277,8 +249,7 @@ adm_access_alloc(svn_wc_adm_access_t **a
> if (err)
> return svn_error_compose_create(
> err,
> - svn_wc__remove_adm_file(lock->abspath, SVN_WC__ADM_LOCK,
> - scratch_pool));
> + svn_wc__db_lock_remove(db, lock->abspath, scratch_pool));
Heh. I'm guessing you want svn_wc__db_wclock_remove() here.
>...
> +++ trunk/subversion/libsvn_wc/upgrade.c Thu Oct 1 08:17:49 2009 (r39740)
>...
> @@ -336,6 +359,18 @@ upgrade_to_wcng(svn_wc__db_t *db,
> SVN_ERR(svn_wc__db_upgrade_begin(&sdb, dir_abspath,
> this_dir->repos, this_dir->uuid,
> scratch_pool, scratch_pool));
> + {
> + /* Unfortunately, we can't call the svn_wc__db_wclock_set() API just yet,
> + since the sdb isn't yet the right format. So we've got to do the lock
> + insertion manually. */
You could if this happens right after the reset_format() call a few lines below.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402729