You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/05/29 17:54:43 UTC
svn commit: r1128897 -
/subversion/trunk/subversion/tests/cmdline/relocate_tests.py
Author: rhuijben
Date: Sun May 29 15:54:43 2011
New Revision: 1128897
URL: http://svn.apache.org/viewvc?rev=1128897&view=rev
Log:
In the relocate tests replace all invocations of
'svn switch --relocate --ignore-ancestry' with a simple 'svn relocate'.
(This leaves a 'switch --relocate' test).
I think --relocate in combination with --ignore-ancestry should give an error.
* subversion/tests/cmdline/relocate_tests.py
(relocate_beyond_repos_root,
relocate_and_propset,
single_file_relocate,
relocate_with_switched_children,
relocate_with_relative_externals): Update calls.
Modified:
subversion/trunk/subversion/tests/cmdline/relocate_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/relocate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/relocate_tests.py?rev=1128897&r1=1128896&r2=1128897&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Sun May 29 15:54:43 2011
@@ -182,21 +182,18 @@ def relocate_beyond_repos_root(sbox):
# This tests for issue #2380.
svntest.actions.run_and_verify_svn(None, None,
".*Invalid relocation destination.*",
- 'switch', '--relocate',
- '--ignore-ancestry',
+ 'relocate',
A_url, other_B_url, A_wc_dir)
# Another way of trying to change the fs path, leading to an invalid
# repository root.
svntest.actions.run_and_verify_svn(None, None,
".*is not the root.*",
- 'switch', '--relocate',
- '--ignore-ancestry',
+ 'relocate',
repo_url, other_B_url, A_wc_dir)
svntest.actions.run_and_verify_svn(None, None, [],
- 'switch', '--relocate',
- '--ignore-ancestry',
+ 'relocate',
A_url, other_A_url, A_wc_dir)
# Check that we can contact the repository, meaning that the
@@ -243,8 +240,7 @@ def relocate_and_propset(sbox):
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
svntest.main.safe_rmtree(repo_dir, 1)
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
- '--ignore-ancestry',
+ svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
repo_url, other_repo_url, wc_dir)
# Remove gamma from the working copy.
@@ -315,8 +311,7 @@ def single_file_relocate(sbox):
svntest.main.safe_rmtree(repo_dir, 1)
svntest.actions.run_and_verify_svn(None, None,
".*Cannot relocate.*",
- 'switch', '--relocate',
- '--ignore-ancestry',
+ 'relocate',
iota_url, other_iota_url, iota_path)
#----------------------------------------------------------------------
@@ -337,8 +332,7 @@ def relocate_with_switched_children(sbox
svntest.main.safe_rmtree(repo_dir, 1)
# Do the switch and check the results in three ways.
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
- '--ignore-ancestry',
+ svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
repo_url, other_repo_url, wc_dir)
# Attempt to commit changes and examine results
@@ -395,8 +389,7 @@ def relocate_with_relative_externals(sbo
svntest.main.safe_rmtree(repo_dir, 1)
# Now relocate our working copy.
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
- '--ignore-ancestry',
+ svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
repo_url, other_repo_url, wc_dir)
# Check the URLs of the externals -- were they updated to point to the