You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/01/29 05:04:40 UTC
svn commit: r1562351 - in /subversion/branches/1.8.x: ./ STATUS
subversion/mod_dav_svn/reports/update.c
Author: svn-role
Date: Wed Jan 29 04:04:39 2014
New Revision: 1562351
URL: http://svn.apache.org/r1562351
Log:
Merge r1557522 from trunk:
* r1557522
Make mod_dav_svn report all property changes in 'include-properties' mode,
even in uncommon configurations.
Justification:
This needs a fix in either client or server if we ever want to restart
using the report copyfrom mode.
Votes:
+1: rhuijben, stefan2, philip
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/mod_dav_svn/reports/update.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1557522
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1562351&r1=1562350&r2=1562351&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jan 29 04:04:39 2014
@@ -255,12 +255,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1557522
- Make mod_dav_svn report all property changes in 'include-properties' mode,
- even in uncommon configurations.
- Justification:
- This needs a fix in either client or server if we ever want to restart
- using the report copyfrom mode.
- Votes:
- +1: rhuijben, stefan2, philip
Modified: subversion/branches/1.8.x/subversion/mod_dav_svn/reports/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/mod_dav_svn/reports/update.c?rev=1562351&r1=1562350&r2=1562351&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/branches/1.8.x/subversion/mod_dav_svn/reports/update.c Wed Jan 29 04:04:39 2014
@@ -694,8 +694,8 @@ upd_change_xxx_prop(void *baton,
/* That said, beginning in Subversion 1.8, clients might
request even in skelta mode that we transmit properties
- on newly added files explicitly. */
- if ((! b->copyfrom) && value && b->uc->include_props)
+ on added files and directories explicitly. */
+ if (value && b->uc->include_props)
{
SVN_ERR(send_propchange(b, name, value, pool));
}