You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/09/13 19:07:35 UTC
svn commit: r1384404 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: cmpilato
Date: Thu Sep 13 17:07:34 2012
New Revision: 1384404
URL: http://svn.apache.org/viewvc?rev=1384404&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(revert_list_read): Work around the fact that one compile-time-
chosen branch of logic wants a 'const' array of marker paths while
the other needs it non-const.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1384404&r1=1384403&r2=1384404&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Sep 13 17:07:34 2012
@@ -6324,15 +6324,18 @@ revert_list_read(void *baton,
scratch_pool);
if (conflict_data)
{
+ const apr_array_header_t *marker_paths;
svn_skel_t *conflicts = svn_skel__parse(conflict_data,
conflict_len,
scratch_pool);
- SVN_ERR(svn_wc__conflict_read_markers(&b->marker_paths,
+ SVN_ERR(svn_wc__conflict_read_markers(&marker_paths,
b->db, wcroot->abspath,
conflicts,
b->result_pool,
scratch_pool));
+ /* De-const-ify. */
+ b->marker_paths = (apr_array_header_t *)marker_paths;
}
#endif