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 C59B9E88C for ; Thu, 7 Feb 2013 11:58:04 +0000 (UTC) Received: (qmail 5263 invoked by uid 500); 7 Feb 2013 11:58:04 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 5070 invoked by uid 500); 7 Feb 2013 11:58:00 -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 5028 invoked by uid 99); 7 Feb 2013 11:57:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 11:57:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 11:57:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 776342388978; Thu, 7 Feb 2013 11:57:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443429 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Thu, 07 Feb 2013 11:57:38 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130207115738.776342388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Thu Feb 7 11:57:38 2013 New Revision: 1443429 URL: http://svn.apache.org/viewvc?rev=1443429&view=rev Log: * subversion/libsvn_client/merge.c (check_moved_here): Remove unused function. 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=1443429&r1=1443428&r2=1443429&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Feb 7 11:57:38 2013 @@ -1146,36 +1146,6 @@ check_moved_away(const char **op_root_ab return SVN_NO_ERROR; } -/* Indicate in *MOVED_HERE whether the node at LOCAL_ABSPATH was - * moved here locally. Do not raise an error if the node at LOCAL_ABSPATH - * does not exist. */ -static svn_error_t * -check_moved_here(svn_boolean_t *moved_here, - svn_wc_context_t *wc_ctx, - const char *local_abspath, - apr_pool_t *scratch_pool) -{ - const char *moved_from_abspath; - svn_error_t *err; - - *moved_here = FALSE; - - err = svn_wc__node_was_moved_here(&moved_from_abspath, NULL, - wc_ctx, local_abspath, - scratch_pool, scratch_pool); - if (err) - { - if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND) - svn_error_clear(err); - else - return svn_error_trace(err); - } - else if (moved_from_abspath) - *moved_here = TRUE; - - return SVN_NO_ERROR; -} - #define CONFLICT_REASON_NONE ((svn_wc_conflict_reason_t)-1) #define CONFLICT_REASON_SKIP ((svn_wc_conflict_reason_t)-2) #define CONFLICT_REASON_SKIP_WC ((svn_wc_conflict_reason_t)-3)