Author: philip
Date: Thu Apr 18 18:18:20 2013
New Revision: 1469512
URL: http://svn.apache.org/r1469512
Log:
Fix issue 4356, status segv after interrupted move.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_scan_moved): Return error if no moved-to found.
* subversion/tests/cmdline/move_tests.py
(move_missing): Remove XFAIL.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/move_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=1469512&r1=1469511&r2=1469512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Apr 18 18:18:20 2013
@@ -11909,7 +11909,7 @@ svn_wc__db_scan_moved(const char **moved
: NULL,
wcroot, local_relpath, scratch_pool, scratch_pool));
- if (status != svn_wc__db_status_moved_here)
+ if (status != svn_wc__db_status_moved_here || !moved_from_relpath)
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Path '%s' was not moved here"),
path_for_error_message(wcroot, local_relpath,
Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1469512&r1=1469511&r2=1469512&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Apr 18 18:18:20
2013
@@ -1193,7 +1193,6 @@ value3>>>>>>> (incoming property value)
@Issue(4356)
-@XFail()
def move_missing(sbox):
"move a missing directory"
