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 E1E1E11C29 for ; Thu, 21 Aug 2014 10:23:32 +0000 (UTC) Received: (qmail 92784 invoked by uid 500); 21 Aug 2014 10:23:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 92756 invoked by uid 500); 21 Aug 2014 10:23:32 -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 92745 invoked by uid 99); 21 Aug 2014 10:23:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2014 10:23:32 +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, 21 Aug 2014 10:23:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 690E92388999; Thu, 21 Aug 2014 10:23:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1619349 - /subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Date: Thu, 21 Aug 2014 10:23:11 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140821102311.690E92388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Thu Aug 21 10:23:11 2014 New Revision: 1619349 URL: http://svn.apache.org/r1619349 Log: * subversion/libsvn_wc/tree_conflicts.c (node_kind_map): Add yet another ### comment: svn_node_symlink isn't mapped. Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1619349&r1=1619348&r2=1619349&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original) +++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Thu Aug 21 10:23:11 2014 @@ -46,6 +46,7 @@ static const svn_token_map_t node_kind_m { "file", svn_node_file }, { "dir", svn_node_dir }, { "", svn_node_unknown }, + /* ### should also map svn_node_symlink */ { NULL } };