You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2016/11/24 11:43:59 UTC
svn commit: r1771117 - in
/subversion/branches/authzperf/subversion/tests/cmdline: ./
import_tests_data/import_tree/DIR1.noo/
import_tests_data/import_tree/DIR2.doo/
import_tests_data/import_tree/DIR3.foo/
import_tests_data/import_tree/DIR4.goo/ import...
Author: julianfoad
Date: Thu Nov 24 11:43:59 2016
New Revision: 1771117
URL: http://svn.apache.org/viewvc?rev=1771117&view=rev
Log:
Revert r1771116, committed on the wrong branch.
Added:
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR1.noo/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR1.noo/
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR2.doo/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR2.doo/
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR3.foo/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR3.foo/
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR5.moo/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR5.moo/
subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/
- copied from r1771115, subversion/branches/authzperf/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/
Modified:
subversion/branches/authzperf/subversion/tests/cmdline/import_tests.py
Modified: subversion/branches/authzperf/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/tests/cmdline/import_tests.py?rev=1771117&r1=1771116&r2=1771117&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/branches/authzperf/subversion/tests/cmdline/import_tests.py Thu Nov 24 11:43:59 2016
@@ -446,7 +446,8 @@ def import_inherited_ignores(sbox):
# DIR7
# file7.foo
# DIR8.noo
- import_tree_dir = os.path.join(tmp_dir, 'import_tree_' + sbox.name)
+ import_tree_dir = os.path.join(os.path.dirname(sys.argv[0]),
+ 'import_tests_data', 'import_tree')
# Relative WC paths of the imported tree.
dir1_path = os.path.join('DIR1.noo')
@@ -465,33 +466,6 @@ def import_inherited_ignores(sbox):
file7_path = os.path.join('DIR6', 'DIR7', 'file7.foo')
dir8_path = os.path.join('DIR6', 'DIR7', 'DIR8.noo')
- import_dirs = [
- dir1_path,
- dir2_path,
- dir3_path,
- dir4_path,
- dir5_path,
- dir6_path,
- dir7_path,
- dir8_path,
- ]
- import_files = [
- file1_path,
- file2_path,
- file3_path,
- file4_path,
- file5_path,
- file6_path,
- file7_path,
- ]
-
- # Create the (unversioned) tree to be imported.
- os.mkdir(import_tree_dir)
- for p in import_dirs:
- os.mkdir(os.path.join(import_tree_dir, p))
- for p in import_files:
- svntest.main.file_write(os.path.join(import_tree_dir, p), 'A file')
-
# Import the tree to ^/A/B/E.
# We should not see any *.noo paths because those are blocked at the
# root of the repository by the svn:global-ignores property. Likewise