Author: rhuijben
Date: Wed Jul 25 12:41:18 2012
New Revision: 1365560
URL: http://svn.apache.org/viewvc?rev=1365560&view=rev
Log:
And merge r1365556 to this branch to remove the XFail marker
Modified:
subversion/branches/1.7.x-r1365554/ (props changed)
subversion/branches/1.7.x-r1365554/subversion/tests/cmdline/depth_tests.py
Propchange: subversion/branches/1.7.x-r1365554/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1365556
Modified:
subversion/branches/1.7.x-r1365554/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1365554/subversion/tests/cmdline/depth_tests.py?rev=1365560&r1=1365559&r2=1365560&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1365554/subversion/tests/cmdline/depth_tests.py
(original)
+++ subversion/branches/1.7.x-r1365554/subversion/tests/cmdline/depth_tests.py
Wed Jul 25 12:41:18 2012
@@ -2882,21 +2882,26 @@ def commit_then_immediates_update(sbox):
None, None, None, None, None, False,
"--depth=immediates", wc_dir)
-@XFail()
def revert_depth_files(sbox):
"depth immediate+files should revert deleted files"
sbox.build(read_only = True)
expected_output = "Reverted '" + re.escape(sbox.ospath('A/mu')) + "'"
+
+ # Apply an unrelated delete one level to deep
+ sbox.simple_rm('A/D/gamma')
sbox.simple_rm('A/mu')
- # This one works as expected
+ # Expect reversion of just 'mu'
svntest.actions.run_and_verify_svn(None, expected_output, [],
'revert', '--depth=immediates',
sbox.ospath('A'))
+ # Apply an unrelated directory delete
+ sbox.simple_rm('A/D')
+
sbox.simple_rm('A/mu')
- # And this one fails on trunk and 1.7.x
+ # Expect reversion of just 'mu'
svntest.actions.run_and_verify_svn(None, expected_output, [],
'revert', '--depth=files',
sbox.ospath('A'))
