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 89C3610C94 for ; Thu, 22 Jan 2015 12:25:56 +0000 (UTC) Received: (qmail 54045 invoked by uid 500); 22 Jan 2015 12:25:50 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 54010 invoked by uid 500); 22 Jan 2015 12:25:50 -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 53999 invoked by uid 99); 22 Jan 2015 12:25:50 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jan 2015 12:25:50 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id ED279AC0059; Thu, 22 Jan 2015 12:25:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1653829 - /subversion/trunk/subversion/svnrdump/load_editor.c Date: Thu, 22 Jan 2015 12:25:49 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150122122549.ED279AC0059@hades.apache.org> Author: julianfoad Date: Thu Jan 22 12:25:48 2015 New Revision: 1653829 URL: http://svn.apache.org/r1653829 Log: * subversion/svnrdump/load_editor.c (new_node_record): Rewrite a block comment and move it to the top of its block. Modified: subversion/trunk/subversion/svnrdump/load_editor.c Modified: subversion/trunk/subversion/svnrdump/load_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1653829&r1=1653828&r2=1653829&view=diff ============================================================================== --- subversion/trunk/subversion/svnrdump/load_editor.c (original) +++ subversion/trunk/subversion/svnrdump/load_editor.c Thu Jan 22 12:25:48 2015 @@ -526,6 +526,8 @@ new_node_record(void **node_baton, nb->copyfrom_path = apr_pstrdup(rb->pool, hval); } + /* Before handling the new node, ensure depth-first editing order by + traversing the directory hierarchy from the old to the new node. */ nb_dirname = svn_relpath_dirname(nb->path, pool); if (svn_path_compare_paths(nb_dirname, rb->db->relpath) != 0) @@ -536,9 +538,6 @@ new_node_record(void **node_baton, int i; apr_size_t n; - /* Before attempting to handle the action, call open_directory - for all the path components and set the directory baton - accordingly */ ancestor_path = svn_relpath_get_longest_ancestor(nb_dirname, rb->db->relpath, pool);