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

Re: svn commit: r31763 - trunk/subversion/libsvn_wc

From: Daniel Shahaf <d.s_at_daniel.shahaf.co.il>
Date: Tue, 17 Jun 2008 21:45:45 +0300 (Jerusalem Daylight Time)

firemeteor_at_tigris.org wrote on Tue, 17 Jun 2008 at 05:59 -0700:
> Author: firemeteor
> Date: Tue Jun 17 05:59:30 2008
> New Revision: 31763
>
> Log:
> A small readability tweak suggested and approved by kfogel (Karl Fogel).
> I mistakenly did it in my branch. Now, I revert that change and do it in trunk
> first.
>

Please use the standard crediting syntax ("Approved by: kfogel" on
a separate paragraph) when committing outside your area. (See HACKING.)

Also, for the benefit of future historians, mention branch names and
revision numbers liberally. The log message should contain the branch
name and/or the revision number of the commit there that you are redoing
on trunk.

Daniel

> * subversion/libsvn_wc/adm_ops.c
> (svn_wc_remove_from_revision_control): Improve readability by introduce
> block local variable.
>
> Modified:
> trunk/subversion/libsvn_wc/adm_ops.c
>
> Modified: trunk/subversion/libsvn_wc/adm_ops.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_ops.c?pathrev=31763&r1=31762&r2=31763
> ==============================================================================
> --- trunk/subversion/libsvn_wc/adm_ops.c Tue Jun 17 05:42:53 2008 (r31762)
> +++ trunk/subversion/libsvn_wc/adm_ops.c Tue Jun 17 05:59:30 2008 (r31763)
> @@ -2550,16 +2550,17 @@ svn_wc_remove_from_revision_control(svn_
> full_path. We need to remove that entry: */
> if (! is_root)
> {
> + apr_hash_t *parent_entries;
> svn_wc_adm_access_t *parent_access;
>
> svn_path_split(full_path, &parent_dir, &base_name, pool);
>
> SVN_ERR(svn_wc_adm_retrieve(&parent_access, adm_access,
> parent_dir, pool));
> - SVN_ERR(svn_wc_entries_read(&entries, parent_access, TRUE,
> + SVN_ERR(svn_wc_entries_read(&parent_entries, parent_access, TRUE,
> pool));
> - svn_wc__entry_remove(entries, base_name);
> - SVN_ERR(svn_wc__entries_write(entries, parent_access, pool));
> + svn_wc__entry_remove(parent_entries, base_name);
> + SVN_ERR(svn_wc__entries_write(parent_entries, parent_access, pool));
> }
> }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-17 20:46:27 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.