svn commit: r1687520 - /subversion/trunk/subversion/svn/status.c

[stsp]

Author: stsp
Date: Thu Jun 25 13:54:50 2015
New Revision: 1687520

URL: http://svn.apache.org/r1687520
Log:
* subversion/svn/status.c
  (print_status): Fix a shadowed local variable introduced in r1687498.

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=1687520&r1=1687519&r2=1687520&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Thu Jun 25 13:54:50 2015
@@ -282,14 +282,14 @@ print_status(const char *target_abspath,
 
       if (tree_conflicted)
         {
-          const svn_wc_conflict_description2_t *desc;
+          const svn_wc_conflict_description2_t *desc2;
           svn_client_conflict_t *tree_conflict;
 
-          SVN_ERR(svn_wc__get_tree_conflict(&desc, ctx->wc_ctx,
+          SVN_ERR(svn_wc__get_tree_conflict(&desc2, ctx->wc_ctx,
                                             local_abspath, pool, pool));
           SVN_ERR_ASSERT(desc != NULL);
 
-          tree_conflict = svn_client_conflict_from_wc_description2_t(desc,
+          tree_conflict = svn_client_conflict_from_wc_description2_t(desc2,
                                                                      pool,
                                                                      pool);
           tree_status_code = 'C';