Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1ACD81751C for ; Fri, 11 Sep 2015 08:55:07 +0000 (UTC) Received: (qmail 99436 invoked by uid 500); 11 Sep 2015 08:55:07 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 99400 invoked by uid 500); 11 Sep 2015 08:55:07 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 99390 invoked by uid 99); 11 Sep 2015 08:55:06 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Sep 2015 08:55:06 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id D81F5AC0184 for ; Fri, 11 Sep 2015 08:55:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1702407 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Fri, 11 Sep 2015 08:55:06 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150911085506.D81F5AC0184@hades.apache.org> 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,