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/04 18:33:39 UTC
svn commit: r940937 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c
wc-metadata.sql
Author: julianfoad
Date: Tue May 4 16:33:38 2010
New Revision: 940937
URL: http://svn.apache.org/viewvc?rev=940937&view=rev
Log:
Bump the WC format to add a '.svn/pristine' dir.
* subversion/libsvn_wc/upgrade.c
(bump_to_17): Rename to 'bump_to_YYY'.
(svn_wc__upgrade_sdb): Add an upgrade to format 17, that creates a
'.svn/pristine' dir.
* subversion/libsvn_wc/wc-metadata.sql
In comments, mention format 'YYY' instead of '17'.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=940937&r1=940936&r2=940937&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue May 4 16:33:38 2010
@@ -1041,11 +1041,11 @@ migrate_props(const char *wcroot_abspath
/* */
static svn_error_t *
-bump_to_17(void *baton, svn_sqlite__db_t *sdb, apr_pool_t *scratch_pool)
+bump_to_YYY(void *baton, svn_sqlite__db_t *sdb, apr_pool_t *scratch_pool)
{
const char *wcroot_abspath = baton;
- SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_17));
+ SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_UPGRADE_TO_YYY));
/* ### or something like this... */
SVN_ERR(migrate_props(wcroot_abspath, sdb, scratch_pool));
@@ -1145,10 +1145,20 @@ svn_wc__upgrade_sdb(int *result_format,
scratch_pool));
++start_format;
-#if 0
case 16:
+ /* Create a '.svn/pristine' directory. */
+ {
+ const char *pristine_dir = svn_wc__adm_child(wcroot_abspath,
+ SVN_WC__ADM_PRISTINE,
+ scratch_pool);
+ SVN_ERR(svn_io_dir_make(pristine_dir, APR_OS_DEFAULT, scratch_pool));
+ }
+ ++start_format;
+
+#if 0
+ case YYY-1:
/* Move the properties into the database. */
- SVN_ERR(svn_sqlite__with_transaction(sdb, bump_to_17,
+ SVN_ERR(svn_sqlite__with_transaction(sdb, bump_to_YYY,
(void *)wcroot_abspath,
scratch_pool));
++start_format;
Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=940937&r1=940936&r2=940937&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Tue May 4 16:33:38 2010
@@ -584,8 +584,8 @@ PRAGMA user_version = 16;
/* ------------------------------------------------------------------------- */
-/* Format 17 introduces new handling for conflict information. */
--- format: 17
+/* Format YYY introduces new handling for conflict information. */
+-- format: YYY
/* ------------------------------------------------------------------------- */