subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1443429 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 07 Feb 2013 11:57:38 GMT
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)



Mime
View raw message