You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/06/09 02:24:49 UTC
svn commit: r1133612 - in /subversion/trunk/subversion/tests/cmdline:
upgrade_tests.py upgrade_tests_data/add_add_x2.tar.bz2
Author: philip
Date: Thu Jun 9 00:24:49 2011
New Revision: 1133612
URL: http://svn.apache.org/viewvc?rev=1133612&view=rev
Log:
Add another XFAIL regression test for issue 3916, upgrade with tree conflicts.
* subversion/tests/cmdline/upgrade_tests.py
(add_add_x2): New test.
(test_list): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/add_add_x2.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_x2.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=1133612&r1=1133611&r2=1133612&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Jun 9 00:24:49 2011
@@ -1001,6 +1001,24 @@ def add_add_del_del_tc(sbox):
})
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+@Issue(3916)
+@XFail()
+def add_add_x2(sbox):
+ "wc with 2 tree conflicts in same entry"
+
+ replace_sbox_with_tarfile(sbox, 'add_add_x2.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='4'),
+ 'A' : Item(status=' ', wc_rev='4'),
+ 'A/X' : Item(status='A ', treeconflict='C', copied='+', wc_rev='-'),
+ 'A/Y' : Item(status='A ', treeconflict='C', copied='+', wc_rev='-'),
+ })
+ run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+
########################################################################
# Run the tests
@@ -1046,6 +1064,7 @@ test_list = [ None,
depth_exclude,
depth_exclude_2,
add_add_del_del_tc,
+ add_add_x2,
]
Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_x2.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_x2.tar.bz2?rev=1133612&view=auto
==============================================================================
Binary file - no diff available.
Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_x2.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream