You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/03/19 05:00:47 UTC
svn commit: r1579129 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_wc/wc_db_wcroot.c subversion/tests/cmdline/upgrade_tests.py
subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2
Author: svn-role
Date: Wed Mar 19 04:00:46 2014
New Revision: 1579129
URL: http://svn.apache.org/r1579129
Log:
Merge the r1572102 group from trunk:
* r1572102, r1572200
Fix a failed wc upgrade from 1.7 with exclusive wc locking.
Notes:
1.8 doesn't support running the regression test with exclusive locking
so the regression test always passes.
Justification:
Reported by a user, upgrade is expected to work.
Votes:
+1: philip, brane, rhuijben
Added:
subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2
- copied unchanged from r1572102, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1572102,1572200
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1579129&r1=1579128&r2=1579129&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Mar 19 04:00:46 2014
@@ -314,16 +314,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1572102, r1572200
- Fix a failed wc upgrade from 1.7 with exclusive wc locking.
- Notes:
- 1.8 doesn't support running the regression test with exclusive locking
- so the regression test always passes.
- Justification:
- Reported by a user, upgrade is expected to work.
- Votes:
- +1: philip, brane, rhuijben
-
* r1573088
Add Mavericks to our sysinfo output.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/wc_db_wcroot.c?rev=1579129&r1=1579128&r2=1579129&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/wc_db_wcroot.c Wed Mar 19 04:00:46 2014
@@ -690,8 +690,12 @@ try_symlink_as_dir:
svn_error_clear(err);
*wcroot = NULL;
}
- else
- SVN_ERR(err);
+ else if (err)
+ {
+ /* Close handle if we are not going to use it to support
+ upgrading with exclusive wc locking. */
+ return svn_error_compose_create(err, svn_sqlite__close(sdb));
+ }
}
else
{
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py?rev=1579129&r1=1579128&r2=1579129&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py Wed Mar 19 04:00:46 2014
@@ -1428,6 +1428,17 @@ def changelist_upgrade_1_6(sbox):
if paths != expected_paths:
raise svntest.Failure("changelist not matched")
+
+def upgrade_1_7_dir_external(sbox):
+ "upgrade from 1.7 with dir external"
+
+ sbox.build(create_wc = False)
+ replace_sbox_with_tarfile(sbox, 'upgrade_1_7_dir_external.tar.bz2')
+
+ # This fails for 'make check EXCLUSIVE_WC_LOCKS=1' giving an error:
+ # svn: warning: W200033: sqlite[S5]: database is locked
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
########################################################################
# Run the tests
@@ -1483,6 +1494,7 @@ test_list = [ None,
iprops_upgrade,
iprops_upgrade1_6,
changelist_upgrade_1_6,
+ upgrade_1_7_dir_external,
]