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/04/19 13:13:29 UTC
svn commit: r1739898 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Apr 19 11:13:29 2016
New Revision: 1739898
URL: http://svn.apache.org/viewvc?rev=1739898&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(configure_option_merge_incoming_added_file_text_merge): Tweak description.
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=1739898&r1=1739897&r2=1739898&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Apr 19 11:13:29 2016
@@ -4322,12 +4322,12 @@ configure_option_merge_incoming_added_fi
conflict->local_abspath, scratch_pool,
scratch_pool));
option->description =
- apr_psprintf(options->pool, _("merge file '%s' with '^/%s@%ld'"),
+ apr_psprintf(options->pool, _("merge '^/%s@%ld' into '%s'"),
+ incoming_new_repos_relpath, incoming_new_pegrev,
svn_dirent_local_style(
svn_dirent_skip_ancestor(wcroot_abspath,
conflict->local_abspath),
- scratch_pool),
- incoming_new_repos_relpath, incoming_new_pegrev);
+ scratch_pool));
option->conflict = conflict;
option->do_resolve_func = resolve_merge_incoming_added_file_text_merge;
APR_ARRAY_PUSH(options, const svn_client_conflict_option_t *) = option;