svn commit: r1455908 - in /subversion/trunk/subversion: libsvn_wc/wc_db_update_move.c tests/libsvn_wc/op-depth-test.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 13 12:36:41 2013
New Revision: 1455908

URL: http://svn.apache.org/r1455908
Log:
Fix the segfault/assertion uncovered in r1455881.

* subversion/libsvn_wc/wc_db_update_move.c
  (mark_tree_conflict): Handle no origin as unversioned.

* subversion/tests/libsvn_wc/op-depth-test.c
  (test_funcs): Remove XFail marker.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1455908&r1=1455907&r2=1455908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Mar 13 12:36:41 2013
@@ -324,9 +324,9 @@ mark_tree_conflict(const char *local_rel
                      scratch_pool,
                      scratch_pool));
 
-  if (reason != svn_wc_conflict_reason_unversioned)
+  if (reason != svn_wc_conflict_reason_unversioned
+      && old_repos_relpath != NULL /* no local additions */)
     {
-      SVN_ERR_ASSERT(old_repos_relpath != NULL);
       conflict_old_version = svn_wc_conflict_version_create2(
                                old_version->repos_url, old_version->repos_uuid,
                                old_repos_relpath, old_version->peg_rev,

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1455908&r1=1455907&r2=1455908&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Mar 13 12:36:41 2013
@@ -7855,7 +7855,7 @@ struct svn_test_descriptor_t test_funcs[
                        "move_update_subtree (issue 4232)"),
     SVN_TEST_OPTS_PASS(move_parent_into_child,
                        "move_parent_into_child (issue 4333)"),
-    SVN_TEST_OPTS_XFAIL(move_depth_expand,
+    SVN_TEST_OPTS_PASS(move_depth_expand,
                        "move depth expansion"),
     SVN_TEST_NULL
   };