Author: pburba
Date: Wed Sep 1 15:00:47 2010
New Revision: 991559
URL: http://svn.apache.org/viewvc?rev=991559&view=rev
Log:
Remove some cruft still kicking around from "The Merge Kluge".
* subversion/tests/cmdline/merge_authz_tests.py
(mergeinfo_and_skipped_paths):
* subversion/tests/cmdline/switch_tests.py
(mergeinfo_switch_elision):
Don't record the cwd when we are not going to change it.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=991559&r1=991558&r2=991559&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Wed Sep 1
15:00:47 2010
@@ -194,7 +194,6 @@ def mergeinfo_and_skipped_paths(sbox):
'B/E' : Item(),
'D/H/omega' : Item(),
})
- saved_cwd = os.getcwd()
svntest.actions.run_and_verify_merge(A_COPY_path, '4', '8',
sbox.repo_url + '/A', None,
expected_output,
@@ -273,7 +272,6 @@ def mergeinfo_and_skipped_paths(sbox):
'D/G' : Item(),
'D/H/psi' : Item(),
})
- saved_cwd = os.getcwd()
svntest.actions.run_and_verify_merge(A_COPY_2_path, '4', '8',
sbox.repo_url + '/A', None,
expected_output,
@@ -338,7 +336,6 @@ def mergeinfo_and_skipped_paths(sbox):
'C' : Item(),
})
expected_skip = wc.State(A_COPY_3_path, {'B/E' : Item()})
- saved_cwd = os.getcwd()
svntest.actions.run_and_verify_merge(A_COPY_3_path, '5', '7',
sbox.repo_url + '/A', None,
expected_output,
@@ -378,7 +375,6 @@ def mergeinfo_and_skipped_paths(sbox):
expected_skip = wc.State(A_COPY_2_H_path, {
'psi' : Item(),
})
- saved_cwd = os.getcwd()
# Note we don't bother checking expected mergeinfo output because the
# multiple merges being performed here, -c5 and -c8, will result in
# first ' U' and then ' G' mergeinfo notifications. Our expected
@@ -442,7 +438,6 @@ def mergeinfo_and_skipped_paths(sbox):
props={SVN_PROP_MERGEINFO : '/A/D/H/zeta:8-9'}),
})
expected_skip = wc.State(A_COPY_2_H_path, {})
- saved_cwd = os.getcwd()
svntest.actions.run_and_verify_merge(A_COPY_2_H_path, '7', '9',
sbox.repo_url + '/A/D/H', None,
expected_output,
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=991559&r1=991558&r2=991559&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Wed Sep 1
15:00:47 2010
@@ -1810,8 +1810,6 @@ def mergeinfo_switch_elision(sbox):
'F' : Item(),
})
expected_skip = svntest.wc.State(B_COPY_1_path, { })
- saved_cwd = os.getcwd()
-
svntest.actions.run_and_verify_merge(B_COPY_1_path, '2', '4',
sbox.repo_url + '/A/B', None,
expected_output,
@@ -1858,8 +1856,6 @@ def mergeinfo_switch_elision(sbox):
'beta' : Item("New content"),
})
expected_skip = svntest.wc.State(E_COPY_2_path, { })
- saved_cwd = os.getcwd()
-
svntest.actions.run_and_verify_merge(E_COPY_2_path, '2', '4',
sbox.repo_url + '/A/B/E', None,
expected_output,
