Author: philip
Date: Thu May 10 17:25:59 2012
New Revision: 1336803
URL: http://svn.apache.org/viewvc?rev=1336803&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(op_revert_recursive_txn): Reset statement on path not found.
* subversion/tests/cmdline/revert_tests.py
(revert_nonexistent): Remove WIMP, tweak expectations.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/revert_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1336803&r1=1336802&r2=1336803&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu May 10 17:25:59 2012
@@ -5503,7 +5503,8 @@ op_revert_recursive_txn(void *baton,
if (affected_rows)
return SVN_NO_ERROR; /* actual-only revert */
- return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
+ return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
+ svn_sqlite__reset(stmt),
_("The node '%s' was not found."),
path_for_error_message(wcroot,
local_relpath,
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1336803&r1=1336802&r2=1336803&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Thu May 10
17:25:59 2012
@@ -1600,12 +1600,10 @@ def revert_with_unversioned_targets(sbox
actual_disk = svntest.tree.build_tree_from_wc(wc_dir, 1)
svntest.tree.compare_trees("disk", actual_disk, expected_disk.old_tree())
-@Wimp("aborts in maintainer mode")
-# leaks an unresetted svn_sqlite__stmt_t in maintainer builds
def revert_nonexistent(sbox):
'svn revert -R nonexistent'
sbox.build(read_only=True)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, 'Skipped.*nonexistent', [],
'revert', '-R',
sbox.ospath('nonexistent'))
########################################################################
