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 2013/02/20 20:22:56 UTC
svn commit: r1448358 -
/subversion/trunk/subversion/tests/cmdline/diff_tests.py
Author: rhuijben
Date: Wed Feb 20 19:22:56 2013
New Revision: 1448358
URL: http://svn.apache.org/r1448358
Log:
* subversion/tests/cmdline/diff_tests.py
(diff_two_working_copies): Remove XFail. Update expected result:
a delete of a file, followed by an add of a directory with the
same name produces two headers, not one.
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=1448358&r1=1448357&r2=1448358&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed Feb 20 19:22:56 2013
@@ -3884,7 +3884,6 @@ def no_spurious_conflict(sbox):
expected_status.tweak('3449_spurious', status=' ')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
-@XFail()
def diff_two_working_copies(sbox):
"diff between two working copies"
sbox.build()
@@ -3963,7 +3962,10 @@ def diff_two_working_copies(sbox):
src_label, dst_label) + [
"@@ -1 +0,0 @@\n",
"-This is the file 'pi'.\n",
- ] + make_diff_prop_header('A/D/G/pi') + \
+ ] + make_diff_header('A/D/G/pi', 'working copy',
+ 'working copy',
+ src_label, dst_label) + \
+ make_diff_prop_header('A/D/G/pi') + \
make_diff_prop_added("newprop", "propval") + \
make_diff_header('A/D/H/chi', 'working copy',
'working copy',