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 0BFBA18C2F for ; Wed, 28 Oct 2015 16:38:27 +0000 (UTC) Received: (qmail 74202 invoked by uid 500); 28 Oct 2015 16:38:01 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 74157 invoked by uid 500); 28 Oct 2015 16:38:01 -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 74085 invoked by uid 99); 28 Oct 2015 16:38:01 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 16:38:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 593AE18098E for ; Wed, 28 Oct 2015 16:38:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.99 X-Spam-Level: X-Spam-Status: No, score=0.99 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id buBWKcI0FUZ2 for ; Wed, 28 Oct 2015 16:38:00 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 7F82C429A6 for ; Wed, 28 Oct 2015 16:38:00 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id D2419E0232 for ; Wed, 28 Oct 2015 16:37:59 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id AB88E3A0178 for ; Wed, 28 Oct 2015 16:37:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1711049 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Date: Wed, 28 Oct 2015 16:37:59 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151028163759.AB88E3A0178@svn01-us-west.apache.org> Author: julianfoad Date: Wed Oct 28 16:37:59 2015 New Revision: 1711049 URL: http://svn.apache.org/viewvc?rev=1711049&view=rev Log: On the 'move-tracking-2' branch: Fix assumptions about EIDs. * subversion/svnmover/svnmover.c (show_subtree_diff, do_put_file): Allow negative EIDs. Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1711049&r1=1711048&r2=1711049&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original) +++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Oct 28 16:37:59 2015 @@ -1471,8 +1471,8 @@ show_subtree_diff(svn_branch_subtree_t * apr_hash_t *diff_changes; SVN_ITER_T(diff_item_t) *ai; - SVN_ERR_ASSERT(left && left->tree->root_eid >= 0 - && right && right->tree->root_eid >= 0); + SVN_ERR_ASSERT(left && left->tree->root_eid != -1 + && right && right->tree->root_eid != -1); SVN_ERR(subtree_diff(&diff_changes, left, right, scratch_pool, scratch_pool)); @@ -1783,7 +1783,7 @@ do_put_file(svn_branch_txn_t *txn, const char *name; svn_element_payload_t *payload; - if (file_el_rev->eid >= 0) + if (file_el_rev->eid != -1) { /* get existing props */ svn_element_content_t *existing_element @@ -1821,7 +1821,7 @@ do_put_file(svn_branch_txn_t *txn, name = file_name; } - if (file_el_rev->eid >= 0) + if (file_el_rev->eid != -1) { SVN_ERR(svn_branch_state_alter_one(file_el_rev->branch, file_el_rev->eid, parent_eid, name, payload,