You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/05/24 13:28:59 UTC

svn commit: r947605 - /subversion/trunk/subversion/libsvn_wc/adm_files.c

Author: julianfoad
Date: Mon May 24 11:28:58 2010
New Revision: 947605

URL: http://svn.apache.org/viewvc?rev=947605&view=rev
Log:
* subversion/libsvn_wc/adm_files.c
  (svn_wc__get_ultimate_base_contents): Remove a conversion to SHA-1,
    which was made redundant by r947600.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_files.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=947605&r1=947604&r2=947605&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Mon May 24 11:28:58 2010
@@ -347,10 +347,6 @@ svn_wc__get_ultimate_base_contents(svn_s
                                    NULL, NULL, NULL,
                                    db, local_abspath,
                                    scratch_pool, scratch_pool));
-  if (checksum && checksum->kind != svn_checksum_sha1)
-    SVN_ERR(svn_wc__db_pristine_get_sha1(&checksum, db, local_abspath,
-                                         checksum,
-                                         scratch_pool, scratch_pool));
   if (kind != svn_wc__db_kind_file)
     return svn_error_createf(SVN_ERR_WC_NOT_FILE, NULL,
                              _("base node of '%s' is not a file"),