subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1355703 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/props.c
Date Sat, 30 Jun 2012 11:15:40 GMT
Author: svn-role
Date: Sat Jun 30 11:15:39 2012
New Revision: 1355703

URL: http://svn.apache.org/viewvc?rev=1355703&view=rev
Log:
Merge r1353572 from trunk:

 * r1353572
   Fix a bug in propset which could prevent updating cached values related
   to EOL expansion in wc.db.
   Justification:
     Incorrect behaviour, subtle working copy corruption.
   Votes:
     +1: stsp, rhuijben, philip

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_wc/props.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1353572

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1355703&r1=1355702&r2=1355703&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jun 30 11:15:39 2012
@@ -124,11 +124,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1353572
-   Fix a bug in propset which could prevent updating cached values related
-   to EOL expansion in wc.db.
-   Justification:
-     Incorrect behaviour, subtle working copy corruption.
-   Votes:
-     +1: stsp, rhuijben, philip

Modified: subversion/branches/1.7.x/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/props.c?rev=1355703&r1=1355702&r2=1355703&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/props.c Sat Jun 30 11:15:39 2012
@@ -2311,7 +2311,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))



Mime
View raw message