Author: philip
Date: Wed May 25 17:17:09 2011
New Revision: 1127587
URL: http://svn.apache.org/viewvc?rev=1127587&view=rev
Log:
Add another XFAIL for issue 3901, upgrade with depth=exclude.
* subversion/tests/cmdline/upgrade_tests.py
(depth_exclude_2): New test.
(test_list): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/depth_exclude_2.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude_2.tar.bz2
(with props)
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1127587&r1=1127586&r2=1127587&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed May 25
17:17:09 2011
@@ -959,6 +959,22 @@ def depth_exclude(sbox):
'A' : Item(status=' ', wc_rev='1'),
'X' : Item(status='A ', copied='+', wc_rev='-'),
})
+
+@XFail()
+@Issue(3901)
+def depth_exclude_2(sbox):
+ "1.6.x wc that has depth=exclude inside a delete"
+
+ sbox.build(create_wc = False)
+ replace_sbox_with_tarfile(sbox, 'depth_exclude_2.tar.bz2')
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+ expected_status = svntest.wc.State(sbox.wc_dir,
+ {
+ '' : Item(status=' ', wc_rev='1'),
+ 'A' : Item(status='D ', wc_rev='1'),
+ })
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
########################################################################
@@ -1004,6 +1020,7 @@ test_list = [ None,
tree_replace2,
upgrade_from_format_28,
depth_exclude,
+ depth_exclude_2,
]
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude_2.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude_2.tar.bz2?rev=1127587&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude_2.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
