You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/03/14 14:06:44 UTC
svn commit: r1734933 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Mon Mar 14 13:06:44 2016
New Revision: 1734933
URL: http://svn.apache.org/viewvc?rev=1734933&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_incoming_reverse_addition_upon_update): Fix a small oversight
in two of the conflict descriptions.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1734933&r1=1734932&r2=1734933&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Mar 14 13:06:44 2016
@@ -642,8 +642,9 @@ describe_incoming_reverse_addition_upon_
details->rev_author, details->added_rev);
else
return apr_psprintf(result_pool,
- _("item updated from r%ld to r%ld was replaced "
- "with a file by %s in r%ld"), old_rev, new_rev,
+ _("item updated backwards from r%ld to r%ld was "
+ "replaced with a file by %s in r%ld"),
+ old_rev, new_rev,
details->rev_author, details->added_rev);
}
else if (details->replacing_node_kind == svn_node_dir)
@@ -664,8 +665,8 @@ describe_incoming_reverse_addition_upon_
details->rev_author, details->added_rev);
else
return apr_psprintf(result_pool,
- _("item updated from r%ld to r%ld was replaced "
- "with a directory by %s in r%ld"),
+ _("item updated backwards from r%ld to r%ld was "
+ "replaced with a directory by %s in r%ld"),
old_rev, new_rev,
details->rev_author, details->added_rev);
}