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 9CFF8C81A for ; Tue, 1 May 2012 03:20:36 +0000 (UTC) Received: (qmail 3124 invoked by uid 500); 1 May 2012 03:20:36 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 3084 invoked by uid 500); 1 May 2012 03:20:34 -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 3044 invoked by uid 99); 1 May 2012 03:20:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 03:20:33 +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; Tue, 01 May 2012 03:20:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A20082388860; Tue, 1 May 2012 03:20:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1332511 - in /subversion/branches/ev2-export: ./ subversion/libsvn_delta/compat.c subversion/libsvn_subr/path.c Date: Tue, 01 May 2012 03:20:11 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120501032011.A20082388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Tue May 1 03:20:11 2012 New Revision: 1332511 URL: http://svn.apache.org/viewvc?rev=1332511&view=rev Log: On the ev2-export branch: Bring up-to-date with trunk. Modified: subversion/branches/ev2-export/ (props changed) subversion/branches/ev2-export/subversion/libsvn_delta/compat.c subversion/branches/ev2-export/subversion/libsvn_subr/path.c Propchange: subversion/branches/ev2-export/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1332388-1332509 Modified: subversion/branches/ev2-export/subversion/libsvn_delta/compat.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_delta/compat.c?rev=1332511&r1=1332510&r2=1332511&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/libsvn_delta/compat.c (original) +++ subversion/branches/ev2-export/subversion/libsvn_delta/compat.c Tue May 1 03:20:11 2012 @@ -1042,7 +1042,9 @@ insert_change(const char *relpath, change->changing = SVN_INVALID_REVNUM; change->deleting = SVN_INVALID_REVNUM; - apr_hash_set(changes, relpath, APR_HASH_KEY_STRING, change); + apr_hash_set(changes, + apr_pstrdup(result_pool, relpath), APR_HASH_KEY_STRING, + change); return change; } Modified: subversion/branches/ev2-export/subversion/libsvn_subr/path.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_subr/path.c?rev=1332511&r1=1332510&r2=1332511&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/libsvn_subr/path.c (original) +++ subversion/branches/ev2-export/subversion/libsvn_subr/path.c Tue May 1 03:20:11 2012 @@ -399,8 +399,8 @@ svn_path_compare_paths(const char *path1 apr_size_t min_len = ((path1_len < path2_len) ? path1_len : path2_len); apr_size_t i = 0; - assert(is_canonical(path1, strlen(path1))); - assert(is_canonical(path2, strlen(path2))); + assert(is_canonical(path1, path1_len)); + assert(is_canonical(path2, path2_len)); /* Skip past common prefix. */ while (i < min_len && path1[i] == path2[i])