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/20 18:01:21 UTC
svn commit: r1740162 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Wed Apr 20 16:01:21 2016
New Revision: 1740162
URL: http://svn.apache.org/viewvc?rev=1740162&view=rev
Log:
Stop showing 'Source left' and 'Source right' for tree conflicts at the
interactive conflict resolution prompt. The new long conflict descriptions
provide more useful information, and source left/right don't add any clarity.
The same information can still be obtained from 'svn info'.
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Stop showing 'Source left:' and 'Source right:'.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1740162&r1=1740161&r2=1740162&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Apr 20 16:01:21 2016
@@ -1435,12 +1435,6 @@ handle_tree_conflict(svn_boolean_t *reso
{
const char *local_change_description;
const char *incoming_change_description;
- const char *src_left_version;
- const char *src_right_version;
- const char *repos_root_url;
- const char *repos_relpath;
- svn_revnum_t peg_rev;
- svn_node_kind_t node_kind;
apr_pool_t *iterpool;
resolver_option_t *tree_conflict_options;
svn_client_conflict_option_id_t option_id;
@@ -1456,39 +1450,11 @@ handle_tree_conflict(svn_boolean_t *reso
SVN_ERR(svn_cmdline_fprintf(
stderr, scratch_pool,
_("Tree conflict on '%s':\n"
- "\n%s\n%s\n\n"),
+ "%s\n%s\n"),
svn_cl__local_style_skip_ancestor(path_prefix,
svn_client_conflict_get_local_abspath(conflict), scratch_pool),
incoming_change_description, local_change_description));
- SVN_ERR(svn_client_conflict_get_repos_info(&repos_root_url, NULL, conflict,
- scratch_pool, scratch_pool));
- SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(&repos_relpath,
- &peg_rev,
- &node_kind,
- conflict,
- scratch_pool,
- scratch_pool));
- src_left_version =
- svn_cl__node_description(repos_root_url, repos_relpath, peg_rev,
- node_kind, repos_root_url, scratch_pool);
- if (src_left_version)
- SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s: %s\n",
- _("Source left"), src_left_version));
-
- SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath,
- &peg_rev,
- &node_kind,
- conflict,
- scratch_pool,
- scratch_pool));
- src_right_version =
- svn_cl__node_description(repos_root_url, repos_relpath, peg_rev,
- node_kind, repos_root_url, scratch_pool);
- if (src_right_version)
- SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s: %s\n",
- _("Source right"), src_right_version));
-
SVN_ERR(build_tree_conflict_options(&tree_conflict_options, conflict,
scratch_pool, scratch_pool));
iterpool = svn_pool_create(scratch_pool);