Author: rhuijben
Date: Tue Jul 27 13:51:08 2010
New Revision: 979700
URL: http://svn.apache.org/viewvc?rev=979700&view=rev
Log:
* subversion/libsvn_wc/upgrade.c
(migrate_props): Following up on r979696, remove SVN_DBG() call.
(svn_wc__upgrade_sdb): Add assertion to make sure that I don't reintroduce
a similar issue like that fixed in r979696.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=979700&r1=979699&r2=979700&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jul 27 13:51:08 2010
@@ -1028,8 +1028,6 @@ migrate_props(const char *wcroot_abspath
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
- SVN_DBG(("Migrating props on %s from %d to 18\n", wcroot_abspath,
original_format));
-
/* Migrate the props for "this dir". */
SVN_ERR(migrate_node_props(wcroot_abspath, "", sdb, original_format,
iterpool));
@@ -1519,6 +1517,17 @@ svn_wc__upgrade_sdb(int *result_format,
#endif
}
+#ifdef SVN_DEBUG
+ if (*result_format != start_format)
+ {
+ int schema_version;
+ SVN_ERR(svn_sqlite__read_schema_version(&schema_version, sdb,
scratch_pool));
+
+ /* If this assertion fails the schema isn't updated correctly */
+ SVN_ERR_ASSERT(schema_version == *result_format);
+ }
+#endif
+
/* Zap anything that might be remaining or escaped our notice. */
wipe_obsolete_files(wcroot_abspath, scratch_pool);
