Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 42D17200B8F for ; Fri, 30 Sep 2016 13:37:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 41638160AD9; Fri, 30 Sep 2016 11:37:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 80857160AC4 for ; Fri, 30 Sep 2016 13:37:03 +0200 (CEST) Received: (qmail 93687 invoked by uid 500); 30 Sep 2016 11:37:02 -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 93677 invoked by uid 99); 30 Sep 2016 11:37:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2016 11:37:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 4EBC5C693F for ; Fri, 30 Sep 2016 11:37:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 6O3tndL5Q-qR for ; Fri, 30 Sep 2016 11:37:01 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 772795FB3D for ; Fri, 30 Sep 2016 11:37:01 +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 7AF9AE0147 for ; Fri, 30 Sep 2016 11:37:00 +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 31DE73A031D for ; Fri, 30 Sep 2016 11:37:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1762885 - /subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Date: Fri, 30 Sep 2016 11:36:59 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160930113700.31DE73A031D@svn01-us-west.apache.org> archived-at: Fri, 30 Sep 2016 11:37:04 -0000 Author: stsp Date: Fri Sep 30 11:36:58 2016 New Revision: 1762885 URL: http://svn.apache.org/viewvc?rev=1762885&view=rev Log: On the 'resolve-incoming-add' branch: * subversion/libsvn_client/conflicts.c (diff_dir_added): Skip adding the root of the added tree itself. The tree's root directory already exists in the working copy. Modified: subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Modified: subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c URL: http://svn.apache.org/viewvc/subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c?rev=1762885&r1=1762884&r2=1762885&view=diff ============================================================================== --- subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c (original) +++ subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Fri Sep 30 11:36:58 2016 @@ -5517,6 +5517,10 @@ diff_dir_added(const char *relpath, svn_node_kind_t db_kind; svn_node_kind_t on_disk_kind; + /* Skip adding the root of the added directory tree itself. */ + if (relpath[0] == '\0') + return SVN_NO_ERROR; + local_abspath = svn_dirent_join(b->target_abspath, relpath, scratch_pool); SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,