Author: danielsh
Date: Tue Mar 29 05:52:25 2011
New Revision: 1086481
URL: http://svn.apache.org/viewvc?rev=1086481&view=rev
Log:
Another smell step on the way to have %s in as many error messages
as applicable.
* subversion/libsvn_wc/tree_conflicts.c
(svn_wc__deserialize_conflict): Unparse the skel into the error message.
Modified:
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1086481&r1=1086480&r2=1086481&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Tue Mar 29 05:52:25
2011
@@ -206,9 +206,11 @@ svn_wc__deserialize_conflict(const svn_w
svn_wc_conflict_description2_t *new_conflict;
if (!is_valid_conflict_skel(skel))
- return svn_error_create(SVN_ERR_WC_CORRUPT, NULL,
- _("Invalid conflict info in tree conflict "
- "description"));
+ return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
+ _("Invalid conflict info '%s' in tree conflict "
+ "description"),
+ skel ? svn_skel__unparse(skel, scratch_pool)->data
+ : "(null)");
/* victim basename */
victim_basename = apr_pstrmemdup(scratch_pool,
