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/02/24 13:15:31 UTC
svn commit: r1732113 - /subversion/trunk/subversion/svn/status.c
Author: stsp
Date: Wed Feb 24 12:15:31 2016
New Revision: 1732113
URL: http://svn.apache.org/viewvc?rev=1732113&view=rev
Log:
* subversion/svn/status.c
(print_status): Eliminate redundant use of svn_wc_conflict_description2_t.
Modified:
subversion/trunk/subversion/svn/status.c
Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1732113&r1=1732112&r2=1732113&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Wed Feb 24 12:15:31 2016
@@ -282,14 +282,9 @@ print_status(const char *target_abspath,
if (tree_conflicted)
{
- const svn_wc_conflict_description2_t *desc2;
svn_client_conflict_t *tree_conflict;
- SVN_ERR(svn_wc__get_tree_conflict(&desc2, ctx->wc_ctx,
- local_abspath, pool, pool));
- SVN_ERR_ASSERT(desc2 != NULL);
-
- SVN_ERR(svn_client_conflict_get(&tree_conflict, desc2->local_abspath,
+ SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath,
ctx, pool, pool));
tree_status_code = 'C';
SVN_ERR(svn_cl__get_human_readable_tree_conflict_description(