svn commit: r928713 - /subversion/trunk/subversion/tests/libsvn_client/client-test.c

[ph...@apache.org]

Author: philip
Date: Mon Mar 29 11:00:58 2010
New Revision: 928713

URL: http://svn.apache.org/viewvc?rev=928713&view=rev
Log:
* subversion/tests/libsvn_client/client-test.c
  (test_patch): Make wc a subdir of an unversioned directory, register
   the unversioned directory for cleanup.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/client-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=928713&r1=928712&r2=928713&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Mon Mar 29 11:00:58 2010
@@ -316,7 +316,15 @@ test_patch(const svn_test_opts_t *opts,
                             "/test-patch-repos", NULL);
 
   repos_url = svn_uri_canonicalize(repos_url, pool);
-  wc_path = svn_dirent_join(cwd, "test-patch-wc", pool);
+
+  /* Put wc inside an unversioned directory.  Checking out a 1.7 wc
+     directly inside a 1.6 wc doesn't work reliably, an intervening
+     unversioned directory prevents the problems. */
+  wc_path = svn_dirent_join(cwd, "test-patch", pool);
+  SVN_ERR(svn_io_make_dir_recursively(wc_path, pool));
+  svn_test_add_dir_cleanup(wc_path);
+
+  wc_path = svn_dirent_join(wc_path, "test-patch-wc", pool);
   SVN_ERR(svn_io_remove_dir2(wc_path, TRUE, NULL, NULL, pool));
   rev.kind = svn_opt_revision_head;
   peg_rev.kind = svn_opt_revision_unspecified;