You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/03 23:11:13 UTC
svn commit: r1099251 - /subversion/trunk/subversion/libsvn_wc/info.c
Author: hwright
Date: Tue May 3 21:11:12 2011
New Revision: 1099251
URL: http://svn.apache.org/viewvc?rev=1099251&view=rev
Log:
* subversion/libsvn_wc/info.c
(build_info_for_entry): Don't choke when attempting to fetch lock information
on non-existent nodes.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099251&r1=1099250&r2=1099251&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Tue May 3 21:11:12 2011
@@ -195,11 +195,21 @@ build_info_for_entry(svn_info2_t **info,
{
svn_wc__db_lock_t *lock;
- SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- &lock, NULL, NULL, NULL, NULL, NULL,
- wc_ctx->db, local_abspath,
- result_pool, scratch_pool));
+ svn_error_t *err = svn_wc__db_base_get_info(NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ &lock, NULL, NULL, NULL,
+ NULL, NULL,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool);
+
+ if (err && (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND))
+ {
+ svn_error_clear(err);
+ lock = NULL;
+ }
+ else if (err)
+ return svn_error_return(err);
if (lock)
{