Author: rhuijben
Date: Sun Apr 19 10:40:17 2015
New Revision: 1674602
URL: http://svn.apache.org/r1674602
Log:
Following up on r1674600, avoid testing the same thing twice and
add a few more edge cases.
* subversion/tests/cmdline/diff_tests.py
(diff_incomplete): Extend test.
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=1674602&r1=1674601&r2=1674602&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Sun Apr 19 10:40:17
2015
@@ -4904,23 +4904,29 @@ def diff_incomplete(sbox):
svntest.verify.compare_and_display_lines('local diff', 'local diff', out1b,
out2b)
+ # And add a replacement on top of the incomplete, server side
svntest.actions.run_and_verify_svn(None, [], 'cp',
sbox.repo_url + '/A/D/H@1',
sbox.repo_url + '/A', '-m', '')
-
- # And add a replacement on top of the incomplete
svntest.actions.run_and_verify_svn(None, [], 'diff',
'-r', 'HEAD',
sbox.wc_dir,
'--notice-ancestry')
-
+ # And client side
+ svntest.actions.run_and_verify_svn(None, [], 'rm', sbox.ospath('A'),
+ '--force')
+ sbox.simple_mkdir('A')
svntest.actions.run_and_verify_svn(None, [], 'diff',
'-r', 'HEAD',
sbox.wc_dir,
'--notice-ancestry')
+ svntest.actions.run_and_verify_svn(None, [], 'diff',
+ sbox.wc_dir,
+ '--notice-ancestry')
+
########################################################################
#Run the tests
