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/10/22 06:02:22 UTC
svn commit: r1534484 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_ra_serf/commit.c subversion/tests/cmdline/commit_tests.py
Author: svn-role
Date: Tue Oct 22 04:02:22 2013
New Revision: 1534484
URL: http://svn.apache.org/r1534484
Log:
Merge r1526439 from trunk:
* r1526439
Improve http status processing during commit using ra_serf to improve
diagnostics.
Justification:
With this patch the problem described as issue #4431, would
probably have been diagnosed months ago.
Votes:
+1: rhuijben, ivan, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c
subversion/branches/1.8.x/subversion/tests/cmdline/commit_tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1526439
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1534484&r1=1534483&r2=1534484&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Oct 22 04:02:22 2013
@@ -118,15 +118,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1526439
- Improve http status processing during commit using ra_serf to improve
- diagnostics.
- Justification:
- With this patch the problem described as issue #4431, would
- probably have been diagnosed months ago.
- Votes:
- +1: rhuijben, ivan, breser
-
* r1534158
Correct error message when FSFS detects unsupported future formats.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c?rev=1534484&r1=1534483&r2=1534484&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/commit.c Tue Oct 22 04:02:22 2013
@@ -1932,7 +1932,18 @@ add_file(const char *path,
if (handler->sline.code != 404)
{
- return svn_error_createf(SVN_ERR_RA_DAV_ALREADY_EXISTS, NULL,
+ if (handler->sline.code != 200)
+ {
+ svn_error_t *err;
+
+ err = svn_ra_serf__error_on_status(handler->sline,
+ handler->path,
+ handler->location);
+
+ SVN_ERR(err);
+ }
+
+ return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
_("File '%s' already exists"), path);
}
}
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/commit_tests.py?rev=1534484&r1=1534483&r2=1534484&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/commit_tests.py Tue Oct 22 04:02:22 2013
@@ -1250,7 +1250,7 @@ def commit_add_file_twice(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "already exists",
+ "E160020: File.*already exists",
wc_dir)
#----------------------------------------------------------------------