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/04/20 15:36:38 UTC
svn commit: r935914 - /subversion/trunk/subversion/libsvn_wc/adm_crawler.c
Author: julianfoad
Date: Tue Apr 20 13:36:38 2010
New Revision: 935914
URL: http://svn.apache.org/viewvc?rev=935914&view=rev
Log:
* subversion/libsvn_wc/adm_crawler.c
(svn_wc__internal_transmit_text_deltas): Eliminate one use of a text base
path, in an error message, by reporting the working file path instead.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=935914&r1=935913&r2=935914&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Apr 20 13:36:38 2010
@@ -1233,22 +1233,16 @@ svn_wc__internal_transmit_text_deltas(co
if (tempfile)
svn_error_clear(svn_io_remove_file2(*tempfile, TRUE, scratch_pool));
- {
- const char *text_base;
-
- SVN_ERR(svn_wc__text_base_path(&text_base, db, local_abspath, FALSE,
- scratch_pool));
-
- return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- _("Checksum mismatch for '%s':\n"
- " expected: %s\n"
- " actual: %s\n"),
- svn_dirent_local_style(text_base, scratch_pool),
- svn_checksum_to_cstring_display(expected_md5_checksum,
+ return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
+ _("Checksum mismatch for text base of '%s':\n"
+ " expected: %s\n"
+ " actual: %s\n"),
+ svn_dirent_local_style(local_abspath,
scratch_pool),
- svn_checksum_to_cstring_display(verify_checksum,
- scratch_pool));
- }
+ svn_checksum_to_cstring_display(
+ expected_md5_checksum, scratch_pool),
+ svn_checksum_to_cstring_display(
+ verify_checksum, scratch_pool));
}
/* Now, handle that delta transmission error if any, so we can stop