Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 79517 invoked from network); 7 Apr 2010 01:06:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Apr 2010 01:06:19 -0000 Received: (qmail 12577 invoked by uid 500); 7 Apr 2010 01:06:19 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 12546 invoked by uid 500); 7 Apr 2010 01:06:19 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 12539 invoked by uid 99); 7 Apr 2010 01:06:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Apr 2010 01:06:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Apr 2010 01:06:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 51CC523888E3; Wed, 7 Apr 2010 01:05:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r931392 - /subversion/trunk/subversion/libsvn_ra/ra_loader.c Date: Wed, 07 Apr 2010 01:05:54 -0000 To: commits@subversion.apache.org From: cmpilato@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100407010554.51CC523888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmpilato Date: Wed Apr 7 01:05:53 2010 New Revision: 931392 URL: http://svn.apache.org/viewvc?rev=931392&view=rev Log: * subversion/libsvn_ra/ra_loader.c (svn_ra_get_mergeinfo): Rework a comment for clarity and correctness. Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=931392&r1=931391&r2=931392&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original) +++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Wed Apr 7 01:05:53 2010 @@ -717,9 +717,10 @@ svn_error_t *svn_ra_get_mergeinfo(svn_ra return SVN_NO_ERROR; } - /* Work around a bug in pre-1.7 servers that caused CATALOG's keys - to be a mix of absolute and relative paths (when they were all - supposed to be relative. */ + /* Even though CATALOG's keys are relative to the session URL, some + older servers returned some of those keys with leading slashes + (for subtree items, when INCLUDE_DESCENDANTS was set). This code + cleans up that mess. */ *catalog = apr_hash_make(pool); for (hi = apr_hash_first(pool, tmp_catalog); hi; hi = apr_hash_next(hi)) {