You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/16 15:46:24 UTC
svn commit: r923777 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_wc/questions.c subversion/tests/cmdline/svntest/actions.py
subversion/tests/cmdline/svntest/main.py
Author: hwright
Date: Tue Mar 16 14:46:23 2010
New Revision: 923777
URL: http://svn.apache.org/viewvc?rev=923777&view=rev
Log:
Reintegrate the 1.6.x-wc-ng-check-override branch:
* ^/subversion/branches/1.6.x-wc-ng-check-override
Disable checks for WC-NG working copies while running the test suite.
Justification:
Allows 'make check' to succeed in working copies of the 1.6.x branch
managed by an svn client from trunk. This is for developer convenience,
it does not make a difference for users.
Votes:
+1: stsp, cmpilato, rhuijben
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_wc/questions.c
subversion/branches/1.6.x/subversion/tests/cmdline/svntest/actions.py
subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 14:46:23 2010
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-r896522:896528-897866
/subversion/branches/1.6.x-r898963:899874-915098
/subversion/branches/1.6.x-r905326:905545-923537
+/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
/subversion/branches/bdb-reverse-deltas:868395-868874
/subversion/branches/diff-callbacks3:866404-867106
/subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 14:46:23 2010
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-r896522/CHANGES:896528-897866
/subversion/branches/1.6.x-r898963/CHANGES:899874-915098
/subversion/branches/1.6.x-r905326/CHANGES:905545-923537
+/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
/subversion/branches/bdb-reverse-deltas/CHANGES:868395-868874
/subversion/branches/diff-callbacks3/CHANGES:866404-867106
/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:867073-867463
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=923777&r1=923776&r2=923777&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 14:46:23 2010
@@ -238,15 +238,6 @@ Approved changes:
Votes:
+1: neels, cmpilato, rhuijben
- * ^/subversion/branches/1.6.x-wc-ng-check-override
- Disable checks for WC-NG working copies while running the test suite.
- Justification:
- Allows 'make check' to succeed in working copies of the 1.6.x branch
- managed by an svn client from trunk. This is for developer convenience,
- it does not make a difference for users.
- Votes:
- +1: stsp, cmpilato, rhuijben
-
* ^/subversion/branches/1.6.x-issue-3242-partial
Merge a portion of the issue 3242 work, specifically the bit that
makes mergeinfo queries in the client layer happen against the
Modified: subversion/branches/1.6.x/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_wc/questions.c?rev=923777&r1=923776&r2=923777&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_wc/questions.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_wc/questions.c Tue Mar 16 14:46:23 2010
@@ -43,6 +43,7 @@
#include "private/svn_wc_private.h"
#include "private/svn_sqlite.h"
+#define SVN_WC_NG_CHECK_ENV_VAR "SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_CHECK_FOR_WC_NG"
static svn_error_t *
is_inside_wc_ng(const char *abspath,
@@ -51,9 +52,16 @@ is_inside_wc_ng(const char *abspath,
apr_pool_t *pool)
{
svn_node_kind_t kind;
- const char *wc_db_path = svn_path_join_many(pool, abspath, ".svn", "wc.db",
- NULL);
+ const char *wc_db_path;
+ char *wc_ng_check_env_var;
+ wc_ng_check_env_var = getenv(SVN_WC_NG_CHECK_ENV_VAR);
+ if (wc_ng_check_env_var &&
+ apr_strnatcasecmp(wc_ng_check_env_var, "yes") == 0)
+ return SVN_NO_ERROR; /* Allow skipping for testing */
+
+ wc_db_path = svn_path_join_many(pool, abspath, SVN_WC_ADM_DIR_NAME,
+ "wc.db", NULL);
SVN_ERR(svn_io_check_path(wc_db_path, &kind, pool));
if (kind == svn_node_file)
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/svntest/actions.py?rev=923777&r1=923776&r2=923777&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/svntest/actions.py Tue Mar 16 14:46:23 2010
@@ -29,6 +29,12 @@ def no_sleep_for_timestamps():
def do_sleep_for_timestamps():
os.environ['SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS'] = 'no'
+def no_check_for_wc_ng():
+ os.environ['SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_CHECK_FOR_WC_NG'] = 'yes'
+
+def do_check_for_wc_ng():
+ os.environ['SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_CHECK_FOR_WC_NG'] = 'no'
+
def setup_pristine_repository():
"""Create the pristine repository and 'svn import' the greek tree"""
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py?rev=923777&r1=923776&r2=923777&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py Tue Mar 16 14:46:23 2010
@@ -1218,6 +1218,7 @@ class TestRunner:
str(self.index)
actions.no_sleep_for_timestamps()
+ actions.no_check_for_wc_ng()
saved_dir = os.getcwd()
try: