Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 76917 invoked from network); 7 Apr 2010 00:54:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Apr 2010 00:54:39 -0000 Received: (qmail 4960 invoked by uid 500); 7 Apr 2010 00:54:39 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 4942 invoked by uid 500); 7 Apr 2010 00:54:39 -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 4935 invoked by uid 99); 7 Apr 2010 00:54:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Apr 2010 00:54:39 +0000 X-ASF-Spam-Status: No, hits=-1154.9 required=10.0 tests=ALL_TRUSTED,AWL 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 00:54:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A78523888DD; Wed, 7 Apr 2010 00:54:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r931385 - /subversion/branches/1.6.x/STATUS Date: Wed, 07 Apr 2010 00:54:18 -0000 To: commits@subversion.apache.org From: cmpilato@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100407005418.3A78523888DD@eris.apache.org> Author: cmpilato Date: Wed Apr 7 00:54:17 2010 New Revision: 931385 URL: http://svn.apache.org/viewvc?rev=931385&view=rev Log: Propose r931209 and r931211 for backport. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=931385&r1=931384&r2=931385&view=diff ============================================================================== --- subversion/branches/1.6.x/STATUS (original) +++ subversion/branches/1.6.x/STATUS Wed Apr 7 00:54:17 2010 @@ -137,6 +137,23 @@ Candidate changes: going to cause problems elsewhere, see http://svn.haxx.se/dev/archive-2010-04/0089.shtml) + * r931209, r931211 + Fixes related to the partial resolution of issue #3242 already backported + here. + Justification: + This fixes, at a minimum, some failing JavaHL tests, but also some + brokenness in functionality not fully explored by our test suite. + Branch: + ^/subversion/branches/1.6.x-3242-partial-fixes + Notes: + r931209 adds some RA patch-up code for correcting the incorrect data + received from the servers when handling the svn_ra_get_mergeinfo() call. + r931211 is the backport of changes required to ensure that the client + queries the correct URL when looking up mergeinfo in certain cases + (primarily 'svn mergeinfo URL ...') + Votes: + +1: cmpilato + Veto-blocked changes: =====================