You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/09/11 10:55:06 UTC
svn commit: r1702407 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: rhuijben
Date: Fri Sep 11 08:55:06 2015
New Revision: 1702407
URL: http://svn.apache.org/r1702407
Log:
* subversion/libsvn_client/merge.c
(client_find_automatic_merge): Following up on r1702397, really remove the
outdated comment.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1702407&r1=1702406&r2=1702407&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Sep 11 08:55:06 2015
@@ -12584,7 +12584,6 @@ client_find_automatic_merge(automatic_me
s_t->target->loc.url,
s_t->target->abspath,
ctx, result_pool, scratch_pool));
- /* ### check for null URL (i.e. added path) here, like in reintegrate? */
SVN_ERR(svn_client__ra_session_from_path2(
&s_t->source_ra_session, &s_t->source,
source_path_or_url, NULL, source_revision, source_revision,