subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1129286 - in /subversion/trunk/subversion: libsvn_client/externals.c libsvn_wc/wc.h tests/cmdline/upgrade_tests.py
Date Mon, 30 May 2011 18:40:23 GMT
Author: rhuijben
Date: Mon May 30 18:40:22 2011
New Revision: 1129286

URL: http://svn.apache.org/viewvc?rev=1129286&view=rev
Log:
As promised: Bump the working copy version to 29.

This upgrade renames existing pristine files to *.svn-base
and introduces the EXTERNALS table in wc.db, inserting data from existing
svn:externals properties.

* subversion/libsvn_client/externals.c
  (#define USE_EXTERNALS_STORE): Uncomment.

* subversion/libsvn_wc/wc.h
  (SVN_WC__VERSION): Bump to 29.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_from_format_28): Remove XFail marking.

Modified:
    subversion/trunk/subversion/libsvn_client/externals.c
    subversion/trunk/subversion/libsvn_wc/wc.h
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1129286&r1=1129285&r2=1129286&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Mon May 30 18:40:22 2011
@@ -42,7 +42,7 @@
 #include "svn_private_config.h"
 #include "private/svn_wc_private.h"
 
-/* #define USE_EXTERNALS_STORE */
+#define USE_EXTERNALS_STORE
 
 /* Closure for handle_external_item_change. */
 struct external_change_baton_t

Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1129286&r1=1129285&r2=1129286&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Mon May 30 18:40:22 2011
@@ -146,16 +146,15 @@ extern "C" {
  * The bump to 28 converted any remaining references to MD5 checksums
  *   to SHA1 checksums. Bumped in r1095214.
  *
- * The bump to 29 renamed the pristine files from '<SHA1>' to
- * '<SHA1>.svn-base' and introduced the EXTERNALS store.
- * ### Not bumped yet
+ * The bump to 29 renamed the pristine files from '<SHA1>' to '<SHA1>.svn-base'
+ * and introduced the EXTERNALS store.
  *
  * == 1.7.x shipped with format ???
  *
  * Please document any further format changes here.
  */
 
-#define SVN_WC__VERSION 28
+#define SVN_WC__VERSION 29
 
 
 /* Formats <= this have no concept of "revert text-base/props".  */

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1129286&r1=1129285&r2=1129286&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon May 30 18:40:22 2011
@@ -921,7 +921,6 @@ def tree_replace2(sbox):
     })
   run_and_verify_status_no_server(sbox.wc_dir, expected_status)
 
-@XFail()  # Requires WC format >= 29.
 def upgrade_from_format_28(sbox):
   """upgrade from format 28: rename pristines"""
 



Mime
View raw message