Author: stsp
Date: Mon Jun 22 16:26:29 2015
New Revision: 1686893
URL: http://svn.apache.org/r1686893
Log:
Follow-up to r1686880:
* subversion/svn/info-cmd.c
(print_info): Fix a couple of test failures introduced by r1686880. Avoid
calling a now tree-conflict-specific function on non-tree conflicts.
Modified:
subversion/trunk/subversion/svn/info-cmd.c
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1686893&r1=1686892&r2=1686893&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Mon Jun 22 16:26:29 2015
@@ -669,8 +669,7 @@ print_info(void *baton,
SVN_ERR(svn_cl__get_human_readable_action_description(&desc,
svn_wc_conflict_action_edit,
svn_client_conflict_get_operation(conflict),
- svn_client_conflict_tree_get_victim_node_kind(
- conflict),
+ info->kind,
pool));
SVN_ERR(svn_cmdline_printf(pool, "%s: %s\n",
