Author: svn-role
Date: Thu Mar 19 18:23:38 2015
New Revision: 1667832
URL: http://svn.apache.org/r1667832
Log:
Merge the r1666270 group from trunk:
* r1666270, r1666272
Resolve a segfault when an update introduces a conflict on the update root
Justification:
Regression from 1.8.x.
Votes:
+1: rhuijben, philip, brane
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c
subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:23:38 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667832&r1=1667831&r2=1667832&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:23:38 2015
@@ -178,13 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1666270, r1666272
- Resolve a segfault when an update introduces a conflict on the update root
- Justification:
- Regression from 1.8.x.
- Votes:
- +1: rhuijben, philip, brane
-
* r1666851
Make JavaHL fetch all revision properties when the api promises too.
Justification:
Modified: subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c?rev=1667832&r1=1667831&r2=1667832&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c Thu Mar 19
18:23:38 2015
@@ -2740,7 +2740,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/branches/1.9.x/subversion/tests/cmdline/prop_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py?rev=1667832&r1=1667831&r2=1667832&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py Thu Mar 19
18:23:38 2015
@@ -2783,6 +2783,31 @@ def wc_propop_on_url(sbox):
'pg', 'my:Q', '-r', 'PREV',
sbox.repo_url)
+def prop_conflict_root(sbox):
+ """property conflict on wc root"""
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_propset('propname', 'propval1', '')
+ sbox.simple_commit()
+ sbox.simple_propset('propname', 'propval2', '')
+ sbox.simple_commit()
+ sbox.simple_update(revision=2)
+ sbox.simple_propset('propname', 'propvalconflict', '')
+
+ expected_output = svntest.wc.State(wc_dir, {
+ '' : Item(status=' C'),
+ })
+ expected_disk = svntest.main.greek_state.copy()
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
+ expected_status.tweak('', status=' C')
+ extra_files = ['dir_conflicts.prej']
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ extra_files=extra_files)
########################################################################
# Run the tests
@@ -2834,6 +2859,7 @@ test_list = [ None,
dir_prop_conflict_details,
iprops_list_abspath,
wc_propop_on_url,
+ prop_conflict_root,
]
if __name__ == '__main__':
