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/08/14 06:00:40 UTC
svn commit: r1513722 - in /subversion/branches/1.8.x: ./ STATUS
subversion/svnmucc/svnmucc.c
Author: svn-role
Date: Wed Aug 14 04:00:40 2013
New Revision: 1513722
URL: http://svn.apache.org/r1513722
Log:
Merge r1511353 from trunk:
* r1511353
svnmucc: Fix an assertion failure.
Justification:
It's an assertion failure.
Votes:
+1: danielsh, rhuijben, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svnmucc/svnmucc.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1511353
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1513722&r1=1513721&r2=1513722&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Aug 14 04:00:40 2013
@@ -254,10 +254,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1511353
- svnmucc: Fix an assertion failure.
- Justification:
- It's an assertion failure.
- Votes:
- +1: danielsh, rhuijben, ivan
Modified: subversion/branches/1.8.x/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnmucc/svnmucc.c?rev=1513722&r1=1513721&r2=1513722&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/1.8.x/subversion/svnmucc/svnmucc.c Wed Aug 14 04:00:40 2013
@@ -1429,7 +1429,14 @@ main(int argc, const char **argv)
if (! anchor)
anchor = url;
else
- anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+ {
+ anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+ if (!anchor || !anchor[0])
+ handle_error(svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ "URLs in the action list do not "
+ "share a common ancestor"),
+ pool);
+ }
if ((++i == action_args->nelts) && (j + 1 < num_url_args))
insufficient(pool);