subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
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 GMT
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);



Mime
View raw message