Author: stsp
Date: Thu Aug 8 08:24:14 2013
New Revision: 1511614
URL: http://svn.apache.org/r1511614
Log:
Revert r1511278 and r1511273, removing a test I added to reproduce what
I assumed was a bug. But I don't believe there is a bug. The behaviour of
'svn diff' in the test case is correct, based on the meaning of -rPREV
being strictly COMMITTED-1.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1511614&r1=1511613&r2=1511614&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Aug 8 08:24:14
2013
@@ -4633,30 +4633,6 @@ def diff_local_missing_obstruction(sbox)
svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
'diff', wc_dir)
-@XFail()
-def diff_prev_of_copy(sbox):
- "diff -rPREV file copied across unrelated revision"
- sbox.build()
- wc_dir = sbox.wc_dir
-
- # Unrelated change to A/B/E/alpha to create r2.
- # Otherwise, the bug doesn't trigger.
- sbox.simple_append('A/B/E/alpha', 'more content')
- sbox.simple_commit()
-
- # Copy A/B/E/beta@1 to A/B/E/beta-copy and commit the copy, creating r3.
- # If this copy is commited in r2 the bug won't trigger.
- # Also, if A/B/E/beta@2 is copied, the bug won't trigger.
- sbox.simple_copy('A/B/E/beta@1', 'A/B/E/beta-copy')
- sbox.simple_commit()
-
- # Try to diff beta-copy against its PREV revision. This should produce
- # empty output, since the copy does not differ from its source.
- # Currently fails with 'Unable to find repository location for
- # beta-copy in revision 2' error.
- svntest.actions.run_and_verify_svn(None, [], [],
- 'diff', '-r', 'PREV',
- sbox.ospath('A/B/E/beta-copy'))
########################################################################
#Run the tests
@@ -4739,7 +4715,6 @@ test_list = [ None,
diff_repos_empty_file_addition,
diff_missing_tree_conflict_victim,
diff_local_missing_obstruction,
- diff_prev_of_copy,
]
if __name__ == '__main__':
