svn commit: r1353572 - /subversion/trunk/subversion/libsvn_wc/props.c

[st...@apache.org]

Author: stsp
Date: Mon Jun 25 14:27:16 2012
New Revision: 1353572

URL: http://svn.apache.org/viewvc?rev=1353572&view=rev
Log:
Fix a typo that could lead to wrong translated_size value. If svn:eol-style
is locally changed and svn:keywords is not, translated_size wasn't reset.

* subversion/libsvn_wc/props.c
  (do_propset): SVN_PROP_EOL_STYLE value should be checked, not
   SVN_PROP_KEYWORDS.

Patch by: Dmitry Pavlenko <pa...@tmatesoft.com>

Modified:
    subversion/trunk/subversion/libsvn_wc/props.c

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1353572&r1=1353571&r2=1353572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Mon Jun 25 14:27:16 2012
@@ -2315,7 +2315,7 @@ do_propset(svn_wc__db_t *db,
     }
   else if (kind == svn_node_file && strcmp(name, SVN_PROP_EOL_STYLE) == 0)
     {
-      svn_string_t *old_value = apr_hash_get(prophash, SVN_PROP_KEYWORDS,
+      svn_string_t *old_value = apr_hash_get(prophash, SVN_PROP_EOL_STYLE,
                                              APR_HASH_KEY_STRING);
 
       if (((value == NULL) != (old_value == NULL))

RE: svn commit: r1353572 - /subversion/trunk/subversion/libsvn_wc/props.c

[Bert Huijben <be...@qqmail.nl>]

> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: maandag 25 juni 2012 16:27
> To: commits@subversion.apache.org
> Subject: svn commit: r1353572 -
> /subversion/trunk/subversion/libsvn_wc/props.c
> 
> Author: stsp
> Date: Mon Jun 25 14:27:16 2012
> New Revision: 1353572
> 
> URL: http://svn.apache.org/viewvc?rev=1353572&view=rev
> Log:
> Fix a typo that could lead to wrong translated_size value. If svn:eol-style
> is locally changed and svn:keywords is not, translated_size wasn't reset.
> 
> * subversion/libsvn_wc/props.c
>   (do_propset): SVN_PROP_EOL_STYLE value should be checked, not
>    SVN_PROP_KEYWORDS.
> 
> Patch by: Dmitry Pavlenko <pa...@tmatesoft.com>

This should probably be ported back to 1.7.x.
(And a testcase would be nice :))

	Bert