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/03/28 06:00:10 UTC
svn commit: r1306143 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_serf/commit.c
Author: svn-role
Date: Wed Mar 28 04:00:10 2012
New Revision: 1306143
URL: http://svn.apache.org/viewvc?rev=1306143&view=rev
Log:
Merge r1302417 from trunk:
* r1302417
Fix another ra_serf assert (MERGE fails).
Notes:
This revision r1300265 originates in #4129; r1298343 originates in #3696.
Votes:
+1: danielsh, stsp, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1302417
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1306143&r1=1306142&r2=1306143&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Mar 28 04:00:10 2012
@@ -119,13 +119,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1302417
- Fix another ra_serf assert (MERGE fails).
- Notes:
- This revision r1300265 originates in #4129; r1298343 originates in #3696.
- Votes:
- +1: danielsh, stsp, rhuijben
-
* r1302588, r1305853
Fix issue #4144, "Reverse merge with replace in source applies diffs
in forward order"
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c?rev=1306143&r1=1306142&r2=1306143&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/commit.c Wed Mar 28 04:00:10 2012
@@ -2218,7 +2218,10 @@ close_edit(void *edit_baton,
if (svn_ra_serf__merge_get_status(merge_ctx) != 200)
{
- SVN_ERR_MALFUNCTION();
+ return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+ _("MERGE request failed: returned %d "
+ "(during commit)"),
+ svn_ra_serf__merge_get_status(merge_ctx));
}
/* Inform the WC that we did a commit. */