svn commit: r1653532 - /subversion/trunk/subversion/libsvn_ra_serf/merge.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Jan 21 13:11:42 2015
New Revision: 1653532

URL: http://svn.apache.org/r1653532
Log:
Add a cheap and simple sanity check in ra_serf, to avoid handling a commit
that didn't produce a new revision as a successful commit.

* subversion/libsvn_ra_serf/merge.c
  (svn_ra_serf__run_merge): Add sanity check on the reported new revision.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/merge.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1653532&r1=1653531&r2=1653532&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Wed Jan 21 13:11:42 2015
@@ -439,5 +439,13 @@ svn_ra_serf__run_merge(const svn_commit_
 
   *commit_info = merge_ctx->commit_info;
 
+  /* Sanity check (Reported to be triggered by CodePlex's svnbridge) */
+  if (! SVN_IS_VALID_REVNUM(merge_ctx->commit_info->revision))
+    {
+      return svn_error_create(SVN_ERR_RA_DAV_PROPS_NOT_FOUND, NULL,
+                              _("The MERGE response did not include "
+                                "a new revision"));
+    }
+
   return SVN_NO_ERROR;
 }