You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/12 19:45:49 UTC
svn commit: r1666272 - in /subversion/trunk/subversion:
libsvn_wc/update_editor.c tests/cmdline/prop_tests.py
Author: rhuijben
Date: Thu Mar 12 18:45:48 2015
New Revision: 1666272
URL: http://svn.apache.org/r1666272
Log:
Following up on r1659365 fix a segfault when the root of an update gets
conflicted.
Found by: philip
* subversion/libsvn_wc/update_editor.c
(close_directory): Following up on r1659365, don't try to check if the
update root is registered as replaced in its parent, which caused
a segfault.
* subversion/tests/cmdline/prop_tests.py
(prop_conflict_root): Remove XFail marker from test added in r1666270.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/tests/cmdline/prop_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1666272&r1=1666271&r2=1666272&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Mar 12 18:45:48 2015
@@ -2752,7 +2752,8 @@ close_directory(void *dir_baton,
db->old_revision,
db->new_repos_relpath,
svn_node_dir, svn_node_dir,
- db->parent_baton->deletion_conflicts
+ (db->parent_baton
+ && db->parent_baton->deletion_conflicts)
? svn_hash_gets(
db->parent_baton->deletion_conflicts,
db->name)
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1666272&r1=1666271&r2=1666272&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Thu Mar 12 18:45:48 2015
@@ -2783,7 +2783,6 @@ def wc_propop_on_url(sbox):
'pg', 'my:Q', '-r', 'PREV',
sbox.repo_url)
-@XFail()
def prop_conflict_root(sbox):
"""property conflict on wc root"""