svn commit: r1127220 - in /subversion/trunk/subversion: libsvn_client/checkout.c tests/cmdline/tree_conflict_tests.py

[st...@apache.org]

Author: stsp
Date: Tue May 24 19:00:25 2011
New Revision: 1127220

URL: http://svn.apache.org/viewvc?rev=1127220&view=rev
Log:
Revert r1127195 until mysterious buildbot failures like the one shown
below are cleared up.

CMD: /home/bt/slaves/x64-centos/build/subversion/svn/svn co http://localhost:19718/svn-test-work/repositories/merge_tests-106 svn-test-work/working_copies/merge_tests-106 --config-dir /home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.042177>
subversion/svn/main.c:2587: (apr_err=155036)
svn: E155036: Please see the 'svn upgrade' command
subversion/svn/checkout-cmd.c:168: (apr_err=155036)
subversion/libsvn_client/checkout.c:243: (apr_err=155036)
subversion/libsvn_client/checkout.c:65: (apr_err=155036)
subversion/libsvn_wc/adm_files.c:443: (apr_err=155036)
subversion/libsvn_wc/adm_files.c:443: (apr_err=155036)
subversion/libsvn_wc/lock.c:101: (apr_err=155036)
subversion/libsvn_wc/wc_db.c:9922: (apr_err=155036)
subversion/libsvn_wc/wc_db_wcroot.c:561: (apr_err=155036)
subversion/libsvn_wc/wc_db_wcroot.c:295: (apr_err=155036)
subversion/libsvn_wc/upgrade.c:1478: (apr_err=155036)
svn: E155036: Working copy '/home/bt/slaves/x64-centos/build/subversion/tests/cmdline' is too old (format 8, created by Subversion 1.4)

Modified:
    subversion/trunk/subversion/libsvn_client/checkout.c
    subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

Modified: subversion/trunk/subversion/libsvn_client/checkout.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/checkout.c?rev=1127220&r1=1127219&r2=1127220&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/checkout.c (original)
+++ subversion/trunk/subversion/libsvn_client/checkout.c Tue May 24 19:00:25 2011
@@ -168,19 +168,6 @@ svn_client__checkout_internal(svn_revnum
 
   if (kind == svn_node_none)
     {
-      svn_boolean_t tree_conflicted;
-
-      /* Make sure we're not checking out into a path that's missing on
-       * disk but is conflicted in some other working copy. */
-      err = svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted,
-                                 ctx->wc_ctx, local_abspath, pool);
-      if (err)
-        svn_error_clear(err);
-      else if (tree_conflicted)
-        return svn_error_createf(SVN_ERR_WC_FOUND_CONFLICT, NULL,
-                                 _("'%s' is an existing item in conflict"),
-                                 svn_dirent_local_style(local_abspath, pool));
-
       /* Bootstrap: create an incomplete working-copy root dir.  Its
          entries file should only have an entry for THIS_DIR with a
          URL, revnum, and an 'incomplete' flag.  */

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1127220&r1=1127219&r2=1127220&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Tue May 24 19:00:25 2011
@@ -1172,10 +1172,14 @@ def actual_only_node_behaviour(sbox):
                      "changelist", "my_changelist", foo_path)
 
   # checkout (co)
+  ### this does not error out -- needs review
   expected_stdout = None
-  expected_stderr = ".*foo.*is an existing item in conflict.*"
+  expected_stderr = []
   run_and_verify_svn(None, expected_stdout, expected_stderr,
                      "checkout", A_copy_url, foo_path)
+  ### for now, ignore the fact that checkout succeeds and remove the nested
+  ### working copy so we can test more commands
+  shutil.rmtree(foo_path)
 
   # cleanup
   expected_stdout = None