You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/09 13:29:58 UTC
svn commit: r920839 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: philip
Date: Tue Mar 9 12:29:58 2010
New Revision: 920839
URL: http://svn.apache.org/viewvc?rev=920839&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(cleanup_dir_baton): Use the proper wc context.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=920839&r1=920838&r2=920839&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar 9 12:29:58 2010
@@ -539,11 +539,7 @@ cleanup_dir_baton(void *dir_baton)
associated with a pool distinct from the edit pool and so were
removed separately. */
if (!err && !eb->close_edit_complete)
- {
- svn_wc_context_t fake_ctx;
- fake_ctx.db = eb->db;
- err = svn_wc__release_write_lock(&fake_ctx, db->local_abspath, pool);
- }
+ err = svn_wc__release_write_lock(eb->wc_ctx, db->local_abspath, pool);
if (err)
{
Re: svn commit: r920839 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Philip Martin <ph...@wandisco.com>.
"Bert Huijben" <be...@qqmail.nl> writes:
> Please use svn_wc__context_create_with_db() if you need to wrap a db.
Already spotted that.
--
Philip
RE: svn commit: r920839 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: dinsdag 9 maart 2010 13:30
> To: commits@subversion.apache.org
> Subject: svn commit: r920839 -
> /subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Author: philip
> Date: Tue Mar 9 12:29:58 2010
> New Revision: 920839
>
> URL: http://svn.apache.org/viewvc?rev=920839&view=rev
> Log:
> * subversion/libsvn_wc/update_editor.c
> (cleanup_dir_baton): Use the proper wc context.
>
> Modified:
> subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upd
> ate_editor.c?rev=920839&r1=920838&r2=920839&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar 9
> 12:29:58 2010
> @@ -539,11 +539,7 @@ cleanup_dir_baton(void *dir_baton)
> associated with a pool distinct from the edit pool and so were
> removed separately. */
> if (!err && !eb->close_edit_complete)
> - {
> - svn_wc_context_t fake_ctx;
> - fake_ctx.db = eb->db;
> - err = svn_wc__release_write_lock(&fake_ctx, db->local_abspath, pool);
> - }
> + err = svn_wc__release_write_lock(eb->wc_ctx, db->local_abspath,
> pool);
>
> if (err)
> {
>
Please use svn_wc__context_create_with_db() if you need to wrap a db. (But we prefer not to go back to wc_ctx wherever possible, by using internal functions that handle only with DBs)
Bert
RE: svn commit: r920839 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: dinsdag 9 maart 2010 13:30
> To: commits@subversion.apache.org
> Subject: svn commit: r920839 -
> /subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Author: philip
> Date: Tue Mar 9 12:29:58 2010
> New Revision: 920839
>
> URL: http://svn.apache.org/viewvc?rev=920839&view=rev
> Log:
> * subversion/libsvn_wc/update_editor.c
> (cleanup_dir_baton): Use the proper wc context.
>
> Modified:
> subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upd
> ate_editor.c?rev=920839&r1=920838&r2=920839&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar 9
> 12:29:58 2010
> @@ -539,11 +539,7 @@ cleanup_dir_baton(void *dir_baton)
> associated with a pool distinct from the edit pool and so were
> removed separately. */
> if (!err && !eb->close_edit_complete)
> - {
> - svn_wc_context_t fake_ctx;
> - fake_ctx.db = eb->db;
> - err = svn_wc__release_write_lock(&fake_ctx, db->local_abspath, pool);
> - }
> + err = svn_wc__release_write_lock(eb->wc_ctx, db->local_abspath,
> pool);
>
> if (err)
> {
>
Please use svn_wc__context_create_with_db() if you need to wrap a db. (But we prefer not to go back to wc_ctx wherever possible, by using internal functions that handle only with DBs)
Bert