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/21 18:11:06 UTC
svn commit: r1736064 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Mon Mar 21 17:11:06 2016
New Revision: 1736064
URL: http://svn.apache.org/viewvc?rev=1736064&view=rev
Log:
Remove a trailing colon from several description strings in the conflict
resolver and insert it into the description string elsewhere.
* subversion/libsvn_client/conflicts.c
(describe_incoming_edit_upon_update,
describe_incoming_edit_upon_switch): Remove trailing colons.
(conflict_tree_get_description_incoming_edit): Likewise, and insert the
colon while adding the list of revisions.
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=1736064&r1=1736063&r2=1736064&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Mar 21 17:11:06 2016
@@ -2302,17 +2302,17 @@ describe_incoming_edit_upon_update(svn_r
return apr_psprintf(result_pool,
_("changes destined for a directory arrived "
"via the following revisions during update "
- "from r%ld to r%ld:"), old_rev, new_rev);
+ "from r%ld to r%ld"), old_rev, new_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
return apr_psprintf(result_pool,
_("changes destined for a file arrived "
"via the following revisions during update "
- "from r%ld to r%ld:"), old_rev, new_rev);
+ "from r%ld to r%ld"), old_rev, new_rev);
else
return apr_psprintf(result_pool,
_("changes from the following revisions arrived "
- "during update from r%ld to r%ld:"),
+ "during update from r%ld to r%ld"),
old_rev, new_rev);
}
else
@@ -2321,19 +2321,19 @@ describe_incoming_edit_upon_update(svn_r
return apr_psprintf(result_pool,
_("changes destined for a directory arrived "
"via the following revisions during backwards "
- "update from r%ld to r%ld:"),
+ "update from r%ld to r%ld"),
old_rev, new_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
return apr_psprintf(result_pool,
_("changes destined for a file arrived "
"via the following revisions during backwards "
- "update from r%ld to r%ld:"),
+ "update from r%ld to r%ld"),
old_rev, new_rev);
else
return apr_psprintf(result_pool,
_("changes from the following revisions arrived "
- "during backwards update from r%ld to r%ld:"),
+ "during backwards update from r%ld to r%ld"),
old_rev, new_rev);
}
}
@@ -2348,19 +2348,19 @@ describe_incoming_edit_upon_switch(const
return apr_psprintf(result_pool,
_("changes destined for a directory arrived via "
"the following revisions during switch to "
- "^/%s@r%ld:"),
+ "^/%s@r%ld"),
new_repos_relpath, new_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
return apr_psprintf(result_pool,
_("changes destined for a directory arrived via "
"the following revisions during switch to "
- "^/%s@r%ld:"),
+ "^/%s@r%ld"),
new_repos_relpath, new_rev);
else
return apr_psprintf(result_pool,
_("changes from the following revisions arrived "
- "during switch to ^/%s@r%ld:"),
+ "during switch to ^/%s@r%ld"),
new_repos_relpath, new_rev);
}
@@ -2491,19 +2491,19 @@ conflict_tree_get_description_incoming_e
action = apr_psprintf(scratch_pool,
_("changes destined for a directory "
"arrived during merge of "
- "^/%s:%ld:"),
+ "^/%s:%ld"),
new_repos_relpath, new_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
action = apr_psprintf(scratch_pool,
_("changes destined for a file "
"arrived during merge of "
- "^/%s:%ld:"),
+ "^/%s:%ld"),
new_repos_relpath, new_rev);
else
action = apr_psprintf(scratch_pool,
_("changes arrived during merge of "
- "^/%s:%ld:"),
+ "^/%s:%ld"),
new_repos_relpath, new_rev);
*description = apr_psprintf(result_pool, _("%s, %s"),
@@ -2516,20 +2516,20 @@ conflict_tree_get_description_incoming_e
action = apr_psprintf(scratch_pool,
_("changes destined for a directory "
"arrived via the following revisions "
- "during merge of ^/%s:%ld-%ld:"),
+ "during merge of ^/%s:%ld-%ld"),
new_repos_relpath, old_rev + 1, new_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
action = apr_psprintf(scratch_pool,
_("changes destined for a file "
"arrived via the following revisions "
- "during merge of ^/%s:%ld-%ld:"),
+ "during merge of ^/%s:%ld-%ld"),
new_repos_relpath, old_rev + 1, new_rev);
else
action = apr_psprintf(scratch_pool,
_("changes from the following revisions "
"arrived during merge of "
- "^/%s:%ld-%ld:"),
+ "^/%s:%ld-%ld"),
new_repos_relpath, old_rev + 1, new_rev);
}
}
@@ -2541,19 +2541,19 @@ conflict_tree_get_description_incoming_e
action = apr_psprintf(scratch_pool,
_("changes destined for a directory "
"arrived during reverse-merge of "
- "^/%s:%ld:"),
+ "^/%s:%ld"),
new_repos_relpath, old_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
action = apr_psprintf(scratch_pool,
_("changes destined for a file "
"arrived during reverse-merge of "
- "^/%s:%ld:"),
+ "^/%s:%ld"),
new_repos_relpath, old_rev);
else
action = apr_psprintf(scratch_pool,
_("changes arrived during reverse-merge "
- "of ^/%s:%ld:"),
+ "of ^/%s:%ld"),
new_repos_relpath, old_rev);
*description = apr_psprintf(result_pool, _("%s, %s"),
@@ -2567,7 +2567,7 @@ conflict_tree_get_description_incoming_e
_("changes destined for a directory "
"arrived via the following revisions "
"during reverse-merge of "
- "^/%s:%ld-%ld:"),
+ "^/%s:%ld-%ld"),
new_repos_relpath, new_rev + 1, old_rev);
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
@@ -2575,20 +2575,20 @@ conflict_tree_get_description_incoming_e
_("changes destined for a file "
"arrived via the following revisions "
"during reverse-merge of "
- "^/%s:%ld-%ld:"),
+ "^/%s:%ld-%ld"),
new_repos_relpath, new_rev + 1, old_rev);
else
action = apr_psprintf(scratch_pool,
_("changes from the following revisions "
"arrived during reverse-merge of "
- "^/%s:%ld-%ld:"),
+ "^/%s:%ld-%ld"),
new_repos_relpath, new_rev + 1, old_rev);
}
}
}
- action = apr_psprintf(scratch_pool, "%s%s", action,
+ action = apr_psprintf(scratch_pool, "%s:%s", action,
describe_incoming_edit_list_modified_revs(
edits, scratch_pool));
*description = apr_psprintf(result_pool, _("%s, %s"), reason, action);