Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F11292EA for ; Thu, 26 Jan 2012 14:58:56 +0000 (UTC) Received: (qmail 23370 invoked by uid 500); 26 Jan 2012 14:58:56 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 23309 invoked by uid 500); 26 Jan 2012 14:58:55 -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 23302 invoked by uid 99); 26 Jan 2012 14:58:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 14:58:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 26 Jan 2012 14:58:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8AE1623888E7 for ; Thu, 26 Jan 2012 14:58:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1236214 - /subversion/trunk/subversion/libsvn_delta/compat.c Date: Thu, 26 Jan 2012 14:58:32 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120126145832.8AE1623888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Thu Jan 26 14:58:32 2012 New Revision: 1236214 URL: http://svn.apache.org/viewvc?rev=1236214&view=rev Log: Ev2 shims: Use the correct base revision when opening a directory. Current number of Ev2 test failures: 21 * subversion/libsvn_delta/compat.c (drive_tree): Use the operation's base revision, not the parent's. Modified: subversion/trunk/subversion/libsvn_delta/compat.c Modified: subversion/trunk/subversion/libsvn_delta/compat.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1236214&r1=1236213&r2=1236214&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_delta/compat.c (original) +++ subversion/trunk/subversion/libsvn_delta/compat.c Thu Jan 26 14:58:32 2012 @@ -1411,8 +1411,7 @@ drive_tree(struct operation *op, { /* Open or create our baton. */ if (op->operation == OP_OPEN || op->operation == OP_PROPSET) - SVN_ERR(editor->open_directory(path, parent_op->baton, - parent_op->base_revision, + SVN_ERR(editor->open_directory(path, parent_op->baton, op->base_revision, scratch_pool, &op->baton)); else if (op->operation == OP_ADD || op->operation == OP_REPLACE)