You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/16 11:58:36 UTC
svn commit: r1339098 - /subversion/trunk/subversion/libsvn_ra/ra_loader.c
Author: stsp
Date: Wed May 16 09:58:35 2012
New Revision: 1339098
URL: http://svn.apache.org/viewvc?rev=1339098&view=rev
Log:
* subversion/libsvn_ra/ra_loader.c
(svn_ra_do_diff3): Restore the assertion removed in r1201824.
Diffs for added/deleted targets do not use the diff editor anymore, so
the diff code now heeds the requirement that the target of an edit can
only contain a single path component.
Modified:
subversion/trunk/subversion/libsvn_ra/ra_loader.c
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1339098&r1=1339097&r2=1339098&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Wed May 16 09:58:35 2012
@@ -902,6 +902,8 @@ svn_error_t *svn_ra_do_diff3(svn_ra_sess
void *diff_baton,
apr_pool_t *pool)
{
+ SVN_ERR_ASSERT(svn_path_is_empty(diff_target)
+ || svn_path_is_single_path_component(diff_target));
return session->vtable->do_diff(session,
reporter, report_baton,
revision, diff_target,