You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by as...@apache.org on 2013/01/18 18:45:17 UTC
svn commit: r1435268 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: astieger
Date: Fri Jan 18 17:45:17 2013
New Revision: 1435268
URL: http://svn.apache.org/viewvc?rev=1435268&view=rev
Log:
Combine conflict callback API messages differing only by punctuation
* subversion/libsvn_wc/conflicts.c
(generate_propconflict, resolve_text_conflicts): Combine messages
which differ only by punctuation, remove trailing period from another
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1435268&r1=1435267&r2=1435268&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jan 18 17:45:17 2013
@@ -1386,7 +1386,7 @@ generate_propconflict(svn_boolean_t *con
*conflict_remains = TRUE;
return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
NULL, _("Conflict callback violated API:"
- " returned no results."));
+ " returned no results"));
}
@@ -1428,7 +1428,7 @@ generate_propconflict(svn_boolean_t *con
return svn_error_create
(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
NULL, _("Conflict callback violated API:"
- " returned no merged file."));
+ " returned no merged file"));
else
{
svn_stringbuf_t *merged_stringbuf;
@@ -1713,8 +1713,8 @@ resolve_text_conflicts(svn_skel_t **work
scratch_pool));
if (result == NULL)
return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
- _("Conflict callback violated API: "
- "returned no results"));
+ _("Conflict callback violated API:"
+ " returned no results"));
if (result->save_merged)
{