You have to check added before checking have_base as an add will be added below its parent, but can still overlay a switched (base)node.
Bert Huijben (mobile phone)
----- Oorspronkelijk bericht -----
Van: dannas_at_apache.org
Verzonden: vrijdag 25 juni 2010 17:40
Aan: commits_at_subversion.apache.org
Onderwerp: svn commit: r958007 - /subversion/trunk/subversion/libsvn_wc/node.c
Author: dannas
Date: Fri Jun 25 15:40:38 2010
New Revision: 958007
URL: http://svn.apache.org/viewvc?rev=958007&view=rev
Log:
Simplify some logic for determining if we can find a repos_relpath
by walking the parents and retrieving their BASE values.
* subversion/libsvn_wc/node.c
(svn_wc__internal_node_get_url
svn_wc__node_get_repos_relpath): Remove redundant checks in favor of
just checking 'have_base'.
Modified:
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=958007&r1=958006&r2=958007&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Fri Jun 25 15:40:38 2010
@@ -339,11 +339,7 @@ svn_wc__internal_node_get_url(const char
scratch_pool, scratch_pool));
if (repos_relpath == NULL)
{
- if (status == svn_wc__db_status_normal
- || status == svn_wc__db_status_incomplete
- || (have_base
- && (status == svn_wc__db_status_deleted
- || status == svn_wc__db_status_obstructed_delete)))
+ if (have_base)
{
SVN_ERR(svn_wc__db_scan_base_repos(&repos_relpath, &repos_root_url,
NULL,
@@ -422,11 +418,7 @@ svn_wc__node_get_repos_relpath(const cha
scratch_pool, scratch_pool));
if (*repos_relpath == NULL)
{
- if (status == svn_wc__db_status_normal
- || status == svn_wc__db_status_incomplete
- || (have_base
- && (status == svn_wc__db_status_deleted
- || status == svn_wc__db_status_obstructed_delete)))
+ if (have_base)
{
SVN_ERR(svn_wc__db_scan_base_repos(repos_relpath, NULL,
NULL,
Received on 2010-06-25 21:36:11 CEST