Author: cmpilato
Date: Wed Jun 15 18:29:44 2011
New Revision: 1136143
URL: http://svn.apache.org/viewvc?rev=1136143&view=rev
Log:
Fix issue #3915 ("upgrade should detect checksum mismatch") by simply
allowing the existing checksum-checking code to run unconditionally
(instead of only in SVN_DEBUG mode).
* subversion/libsvn_wc/entries.c
(write_entry): Remove #ifdef SVN_DEBUG wrappers around
checksum-checking logic, and reformat code for 80 columns.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1136143&r1=1136142&r2=1136143&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Jun 15 18:29:44 2011
@@ -1908,15 +1908,16 @@ write_entry(struct write_baton **entry_n
/* The base MD5 checksum is available in the entry, unless there
* is a copied WORKING node. If possible, verify that the entry
* checksum matches the base file that we found. */
-#ifdef SVN_DEBUG
if (! (working_node && entry->copied))
{
svn_checksum_t *entry_md5_checksum, *found_md5_checksum;
- SVN_ERR(svn_checksum_parse_hex(&entry_md5_checksum,
svn_checksum_md5,
+ SVN_ERR(svn_checksum_parse_hex(&entry_md5_checksum,
+ svn_checksum_md5,
entry->checksum, scratch_pool));
if (text_base_info && text_base_info->revert_base.md5_checksum)
found_md5_checksum = text_base_info->revert_base.md5_checksum;
- else if (text_base_info &&
text_base_info->normal_base.md5_checksum)
+ else if (text_base_info
+ && text_base_info->normal_base.md5_checksum)
found_md5_checksum = text_base_info->normal_base.md5_checksum;
else
found_md5_checksum = NULL;
@@ -1929,7 +1930,6 @@ write_entry(struct write_baton **entry_n
/* SVN_ERR_ASSERT(entry->deleted || ...); */
}
}
-#endif
}
if (this_dir->repos)
