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 2013/03/28 05:00:38 UTC
svn commit: r1461945 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_neon/util.c
Author: svn-role
Date: Thu Mar 28 04:00:37 2013
New Revision: 1461945
URL: http://svn.apache.org/r1461945
Log:
Reintegrate the 1.7.x-neon-properr branch:
* ^/subversion/branches/1.7.x-neon-properr
Justification:
Error messages which refer to "date" and "author" (when they mean
to say "svn:date" and "svn:author") can cause confusion.
Branch:
^/subversion/branches/1.7.x-neon-properr
Votes:
+1: cmpilato, rhuijben, stefan2
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-neon-properr:r1440619-1461944
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461945&r1=1461944&r2=1461945&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar 28 04:00:37 2013
@@ -280,15 +280,6 @@ Veto-blocked changes:
Approved changes:
=================
- * ^/subversion/branches/1.7.x-neon-properr
- Justification:
- Error messages which refer to "date" and "author" (when they mean
- to say "svn:date" and "svn:author") can cause confusion.
- Branch:
- ^/subversion/branches/1.7.x-neon-properr
- Votes:
- +1: cmpilato, rhuijben, stefan2
-
* r1461278
Make svnserve log the replayed revision, not the low-water-mark
revision, when logging the 'replay' operation.
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c?rev=1461945&r1=1461944&r2=1461945&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c Thu Mar 28 04:00:37 2013
@@ -185,7 +185,7 @@ start_207_element(int *elem, void *baton
if (parent == ELEM_prop)
{
svn_stringbuf_setempty(b->propname);
- if (strcmp(nspace, SVN_DAV_PROP_NS_DAV) == 0)
+ if (strcmp(nspace, SVN_DAV_PROP_NS_SVN) == 0)
svn_stringbuf_set(b->propname, SVN_PROP_PREFIX);
else if (strcmp(nspace, "DAV:") == 0)
svn_stringbuf_set(b->propname, "DAV:");