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

Re: svn commit: r899717 - /subversion/trunk/subversion/libsvn_wc/workqueue.c

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Tue, 19 Jan 2010 15:29:31 -0600

r900966.

-Hyrum

On Jan 15, 2010, at 4:06 PM, Greg Stein wrote:

> Hmm. Could this use base_get_info() instead?
>
> On Fri, Jan 15, 2010 at 12:10, <hwright_at_apache.org> wrote:
>> Author: hwright
>> Date: Fri Jan 15 17:10:10 2010
>> New Revision: 899717
>>
>> URL: http://svn.apache.org/viewvc?rev=899717&view=rev
>> Log:
>> * subversion/libsvn_wc/workqueue.c
>> (run_deletion_postcommit): Replace a read-only entry use with
>> svn_wc__db_read_info().
>>
>> Modified:
>> subversion/trunk/subversion/libsvn_wc/workqueue.c
>>
>> Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=899717&r1=899716&r2=899717&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
>> +++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Jan 15 17:10:10 2010
>> @@ -895,7 +895,7 @@
>> const char *repos_relpath;
>> const char *repos_root_url;
>> const char *repos_uuid;
>> - const svn_wc_entry_t *parent_entry;
>> + svn_revnum_t parent_revision;
>>
>> /* If we are suppose to delete "this dir", drop a 'killme' file
>> into my own administrative dir as a signal for svn_wc__run_log()
>> @@ -942,12 +942,14 @@
>> FALSE, FALSE, cancel_func, cancel_baton, scratch_pool));
>>
>> /* If the parent entry's working rev 'lags' behind new_rev... */
>> - SVN_ERR(svn_wc__get_entry(&parent_entry, db,
>> - svn_dirent_dirname(local_abspath,
>> - scratch_pool),
>> - FALSE, svn_node_dir, FALSE,
>> - scratch_pool, scratch_pool));
>> - if (new_revision > parent_entry->revision)
>> + SVN_ERR(svn_wc__db_read_info(NULL, NULL, &parent_revision, NULL, NULL,
>> + NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> + NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> + NULL, NULL, NULL, NULL, NULL,
>> + db, svn_dirent_dirname(local_abspath,
>> + scratch_pool),
>> + scratch_pool, scratch_pool));
>> + if (new_revision > parent_revision)
>> {
>> /* ...then the parent's revision is now officially a
>> lie; therefore, it must remember the file as being
>>
>>
>>
Received on 2010-01-19 22:30:08 CET

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