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

RE: svn commit: r34084 - trunk/subversion/libsvn_wc

From: Bert Huijben <b.huijben_at_competence.biz>
Date: Fri, 7 Nov 2008 15:04:18 +0100

> -----Original Message-----
> From: julianfoad_at_tigris.org [mailto:julianfoad_at_tigris.org]
> Sent: donderdag 6 november 2008 22:02
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r34084 - trunk/subversion/libsvn_wc
>
> Author: julianfoad
> Date: Thu Nov 6 13:02:19 2008
> New Revision: 34084
>
> Log:
> Correct a bug in the WC entries walker. In "show_hidden" mode, it tried
> to
> recurse into a 'deleted' or 'absent' directory.
>
> * subversion/libsvn_wc/entries.c
> (walker_helper): Do not try to recurse into a 'deleted' or 'absent'
> directory.

I didn't review the workings of this patch, but on the WC level we usually see all children of deleted directories and I'm afraid we can't change this behavior.
(Personally I would love to see a directory delete as a single delete action of the root and everything below like we do on the ra level)

I asked some questions on this subject at Subconf, but the option of committing a single file delete below a deleted directory was a feature. (This is also the root cause of the namespace collisions when replacing trees)

        Bert

>
> Modified:
> trunk/subversion/libsvn_wc/entries.c
>
> Modified: trunk/subversion/libsvn_wc/entries.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?p
> athrev=34084&r1=34083&r2=34084
> =======================================================================
> =======
> --- trunk/subversion/libsvn_wc/entries.c Thu Nov 6 12:48:41 2008
> (r34083)
> +++ trunk/subversion/libsvn_wc/entries.c Thu Nov 6 13:02:19 2008
> (r34084)
> @@ -3206,6 +3206,7 @@ walker_helper(const char *dirpath,
>
> /* Recurse into this entry if appropriate. */
> if (current_entry->kind == svn_node_dir
> + && !current_entry->deleted && !current_entry->absent
> && depth >= svn_depth_immediates)
> {
> svn_wc_adm_access_t *entry_access;
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-07 15:04:32 CET

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.