You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/06/23 10:06:23 UTC
svn commit: r957138 - /subversion/trunk/subversion/libsvn_wc/status.c
Author: philip
Date: Wed Jun 23 08:06:23 2010
New Revision: 957138
URL: http://svn.apache.org/viewvc?rev=957138&view=rev
Log:
* subversion/libsvn_wc/status.c
(assemble_status): Make variable const to remove compiler warning, tweak
indentation.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=957138&r1=957137&r2=957138&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Wed Jun 23 08:06:23 2010
@@ -506,10 +506,11 @@ assemble_status(svn_wc_status3_t **statu
explicitly for tree conflicts to allow our users to ignore this detail */
if (!conflicted)
{
- svn_wc_conflict_description2_t *tree_conflict;
+ const svn_wc_conflict_description2_t *tree_conflict;
- SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict, db, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict,
+ db, local_abspath,
+ scratch_pool, scratch_pool));
conflicted = (tree_conflict != NULL);
}