Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r937748 -
 /subversion/trunk/subversion/libsvn_wc/adm_crawler.c
Date: Sun, 25 Apr 2010 05:52:58 -0000
To: commits@subversion.apache.org
From: gstein@apache.org
Message-Id: <20100425055258.4E5FD23888CB@eris.apache.org>

Author: gstein
Date: Sun Apr 25 05:52:57 2010
New Revision: 937748

URL: http://svn.apache.org/viewvc?rev=937748&view=rev
Log:
Fix an erroneous use of svn_uri_is_child.

* subversion/libsvn_wc/adm_crawler.c:
  (report_revisions_and_depths): this is dealing with relpaths, so use the
    right function. and since it is NOT a URI, then we don't need to decode.

Found by: rhuijben

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=937748&r1=937747&r2=937748&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Sun Apr 25 05:52:57 2010
@@ -447,11 +447,11 @@ report_revisions_and_depths(svn_wc__db_t
         }
       else
         {
-          const char *childname = svn_uri_is_child(dir_repos_relpath,
-                                                   this_repos_relpath, NULL);
+          const char *childname = svn_relpath_is_child(dir_repos_relpath,
+                                                       this_repos_relpath,
+                                                       NULL);
 
-          if (childname == NULL
-              || strcmp(svn_path_uri_decode(childname, iterpool), child) != 0)
+          if (childname == NULL || strcmp(childname, child) != 0)
             this_switched = TRUE;
           else
             this_switched = FALSE;