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/31 19:49:26 UTC
svn commit: r929637 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_wc/questions.c
Author: hwright
Date: Wed Mar 31 17:49:25 2010
New Revision: 929637
URL: http://svn.apache.org/viewvc?rev=929637&view=rev
Log:
Reintegrate the 1.6.x-wc-ng-error branch:
* r929382
Ignore errors reading .svn/wc.db from up the tree somewhere, in
trying to prevent creating a 1.6 wc inside a wc-ng.
Justification:
If there happens to be, for example, a /home/.svn that I don't
have permission to read, that should not prevent me from using
'svn checkout'.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570271
Branch:
^/subversion/branches/1.6.x-wc-ng-error
Votes:
+1: peters, gstein, julianfoad
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
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 17:49:25 2010
@@ -37,6 +37,7 @@
/subversion/branches/1.6.x-r923389:927445-929628
/subversion/branches/1.6.x-r926151:927922-929631
/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
+/subversion/branches/1.6.x-wc-ng-error:929379-929636
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 17:49:25 2010
@@ -37,6 +37,7 @@
/subversion/branches/1.6.x-r923389/CHANGES:927445-929628
/subversion/branches/1.6.x-r926151/CHANGES:927922-929631
/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
+/subversion/branches/1.6.x-wc-ng-error/CHANGES:929379-929636
/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
/subversion/branches/diff-callbacks3/CHANGES:870059-870761
/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=929637&r1=929636&r2=929637&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Mar 31 17:49:25 2010
@@ -176,16 +176,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r929382
- Ignore errors reading .svn/wc.db from up the tree somewhere, in
- trying to prevent creating a 1.6 wc inside a wc-ng.
- Justification:
- If there happens to be, for example, a /home/.svn that I don't
- have permission to read, that should not prevent me from using
- 'svn checkout'.
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570271
- Branch:
- ^/subversion/branches/1.6.x-wc-ng-error
- Votes:
- +1: peters, gstein, julianfoad
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=929637&r1=929636&r2=929637&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_wc/questions.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_wc/questions.c Wed Mar 31 17:49:25 2010
@@ -54,6 +54,7 @@ is_inside_wc_ng(const char *abspath,
svn_node_kind_t kind;
const char *wc_db_path;
char *wc_ng_check_env_var;
+ svn_error_t *err;
wc_ng_check_env_var = getenv(SVN_WC_NG_CHECK_ENV_VAR);
if (wc_ng_check_env_var &&
@@ -62,7 +63,12 @@ is_inside_wc_ng(const char *abspath,
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));
+ err = svn_io_check_path(wc_db_path, &kind, pool);
+ if (err)
+ {
+ svn_error_clear(err);
+ return SVN_NO_ERROR;
+ }
if (kind == svn_node_file)
{