Author: stsp
Date: Mon Jan 28 17:03:53 2013
New Revision: 1439502
URL: http://svn.apache.org/viewvc?rev=1439502&view=rev
Log:
Add a test for issue #4307, 'upgrade from 1.7 crashes if WC contains conflict'.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_from_1_7, test_list): New test. Currently upgrades a WC that
contains a text conflict, but can later be extended to cover more cases
once issue #4307 is fixed.
* subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.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=1439502&r1=1439501&r2=1439502&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Jan 28
17:03:53 2013
@@ -1262,6 +1262,18 @@ def upgrade_not_present_replaced(sbox):
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
None, expected_status)
+@XFail()
+@Issue(4307)
+def upgrade_from_1_7(sbox):
+ "upgrade from 1.7 WC (format 29)"
+
+ sbox.build(create_wc=False)
+ replace_sbox_with_tarfile(sbox, 'upgrade_from_1_7_wc.tar.bz2')
+
+ # The working copy contains a text conflict, and upgrading such
+ # a working copy currently crashes 'svn'.
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
########################################################################
# Run the tests
@@ -1313,6 +1325,7 @@ test_list = [ None,
upgrade_file_externals,
upgrade_missing_replaced,
upgrade_not_present_replaced,
+ upgrade_from_1_7,
]
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2?rev=1439502&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/x-bzip2
