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 2012/06/13 14:59:00 UTC
svn commit: r1349815 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_serf/update.c
Author: svn-role
Date: Wed Jun 13 12:59:00 2012
New Revision: 1349815
URL: http://svn.apache.org/viewvc?rev=1349815&view=rev
Log:
Merge the r1349367 group from trunk:
* r1349367, r1349371, r1349380
Fix a bug in ra_serf that prevented it working against pre-1.2 servers.
Justification:
Violation of our compatibility promise.
Votes:
+1: cmpilato, hwright, gstein
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1349367,1349371,1349380
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1349815&r1=1349814&r2=1349815&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun 13 12:59:00 2012
@@ -140,13 +140,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1349367, r1349371, r1349380
- Fix a bug in ra_serf that prevented it working against pre-1.2 servers.
- Justification:
- Violation of our compatibility promise.
- Votes:
- +1: cmpilato, hwright, gstein
-
* r1346765
Allow file://C:\users\me/repos style paths as argument to svn, svnadmin and
svnsync on Windows, like we did in 1.6. (file://%CD%/repos is nice in test
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c?rev=1349815&r1=1349814&r2=1349815&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c Wed Jun 13 12:59:00 2012
@@ -1772,6 +1772,14 @@ start_report(svn_ra_serf__xml_parser_t *
info->prop_val = NULL;
info->prop_val_len = 0;
}
+ else if (strcmp(name.name, "txdelta") == 0)
+ {
+ /* Pre 1.2, mod_dav_svn was using <txdelta> tags (in
+ addition to <fetch-file>s and such) when *not* in
+ "send-all" mode. As a client, we're smart enough to know
+ that's wrong, so we'll just ignore these tags. */
+ ;
+ }
else
{
return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,