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

Re: Trouble replacing adm_access in libsvn_client/merge.c (merge_file_changed)

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 25 Aug 2009 13:45:24 +0100

Daniel Näslund wrote:
> Thanks Julian for your answers.

I'm interested to see how this works out, as I learn about WC-NG. I hope
someone can guide you in the meantime.

- Julian

> As I see it, this is the situation:
>
> It's not an option to close an adm_access baton and reopen it.
> To retrieve an already created adm_access baton I need another
> associated with it or a wc_ctx. Ultimately it's the db I need.
> BUT the db is not allowed to be known outside of libsvn_wc, not even for
> this temporary fix.
>
> Can I create a function svn_wc_adm_retrieve_with_wc_ctx() or something
> similar? Right now I can only get a new adm_access from a wc_ctx when
> outside of libsvn_wc. I can not retrieve an already created adm_access
> from a wc_ctx.
>
> I've tried the following in libsvn_client/merge.c (merge_file_changed):
>
> SVN_ERR(svn_wc__adm_open_in_context(&temp, wc_ctx,
> svn_dirent_dirname(mine, subpool),
> ! merge_b->dry_run, -1, NULL, NULL,
> subpool));
>
>
> err = svn_wc_adm_retrieve(&adm_access, temp,
> svn_dirent_dirname(mine, subpool),
> subpool);
>
> When doing this I get an error saying that the directory is locked,
> probably because there is already an adm_access with a write_lock
> allocated in the calling function.
>
> Mvh
> Daniel

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2387053
Received on 2009-08-27 00:06:04 CEST

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