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 3E4FE9E71 for ; Mon, 2 Jul 2012 20:14:17 +0000 (UTC) Received: (qmail 60765 invoked by uid 500); 2 Jul 2012 20:14:17 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 60737 invoked by uid 500); 2 Jul 2012 20:14:17 -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 60730 invoked by uid 99); 2 Jul 2012 20:14:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2012 20:14:17 +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; Mon, 02 Jul 2012 20:14:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1A78A2388C3E; Mon, 2 Jul 2012 20:13:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1356453 - in /subversion/trunk/subversion: libsvn_wc/props.c tests/libsvn_diff/diff-diff3-test.c Date: Mon, 02 Jul 2012 20:13:52 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120702201354.1A78A2388C3E@eris.apache.org> Author: rhuijben Date: Mon Jul 2 20:13:51 2012 New Revision: 1356453 URL: http://svn.apache.org/viewvc?rev=1356453&view=rev Log: In two places use the proper enum value instead of a boolean. No functional change. * subversion/libsvn_wc/props.c (prop_conflict_from_skel): Use proper enum value for ignore_space. * subversion/tests/libsvn_diff/diff-diff3-test.c (test_wrap): Use an enum value for ignore_space. Modified: subversion/trunk/subversion/libsvn_wc/props.c subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c Modified: subversion/trunk/subversion/libsvn_wc/props.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1356453&r1=1356452&r2=1356453&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/props.c (original) +++ subversion/trunk/subversion/libsvn_wc/props.c Mon Jul 2 20:13:51 2012 @@ -641,7 +641,7 @@ prop_conflict_from_skel(const svn_string if (!(original_is_binary || mine_is_binary || incoming_is_binary)) { diff_opts = svn_diff_file_options_create(scratch_pool); - diff_opts->ignore_space = FALSE; + diff_opts->ignore_space = svn_diff_file_ignore_space_none; diff_opts->ignore_eol_style = FALSE; diff_opts->show_c_function = FALSE; SVN_ERR(svn_diff_mem_string_diff3(&diff, original, mine, incoming, Modified: subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c?rev=1356453&r1=1356452&r2=1356453&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c Mon Jul 2 20:13:51 2012 @@ -2405,7 +2405,7 @@ test_wrap(apr_pool_t *pool) char rdata[(1<<17) + 4+3+3+1]; svn_string_t left, right; svn_diff_file_options_t *diff_opts = svn_diff_file_options_create(pool); - diff_opts->ignore_space = TRUE; + diff_opts->ignore_space = svn_diff_file_ignore_space_change; /* Two long lines. */ memset(ldata, '@', 1<<17);