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

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

From: <kfogel_at_collab.net>
Date: 2004-09-08 16:46:21 CEST

ghudson@tigris.org writes:
> Log:
> Fix an "svn status -u" crash resulting from horked working copies.
>
> * subversion/libsvn_wc/status.c (close_directory): If our working copy
> is not in sync with the repository, we may receive an open_directory
> for a subdir which we have no entry for in the working copy. If
> this directory is not new and has not experienced and property or
> entry changes, we will not create an entry for it in pb->statii, so
> we must be careful of NULL status entries when checking if a closed
> subdir was deleted or replaced.

I wonder if that log message wouldn't be better as a comment in the
code, right before the dir_status check?

-K

> Modified: trunk/subversion/libsvn_wc/status.c
> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_wc/status.c?view=diff&rev=10841&p1=trunk/subversion/libsvn_wc/status.c&r1=10840&p2=trunk/subversion/libsvn_wc/status.c&r2=10841
> ==============================================================================
> --- trunk/subversion/libsvn_wc/status.c (original)
> +++ trunk/subversion/libsvn_wc/status.c Mon Sep 6 13:52:03 2004
> @@ -1332,8 +1332,9 @@
>
> /* See if the directory was deleted or replaced. */
> dir_status = apr_hash_get (pb->statii, db->path, APR_HASH_KEY_STRING);
> - if ((dir_status->repos_text_status == svn_wc_status_deleted)
> - || (dir_status->repos_text_status == svn_wc_status_replaced))
> + if (dir_status &&
> + ((dir_status->repos_text_status == svn_wc_status_deleted)
> + || (dir_status->repos_text_status == svn_wc_status_replaced)))
> was_deleted = TRUE;
>
> /* Now do the status reporting. */
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 8 18:27:51 2004

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.