Author: stsp
Date: Thu Jun 25 14:18:50 2015
New Revision: 1687530
URL: http://svn.apache.org/r1687530
Log:
Follow-up to r1687520:
* subversion/svn/status.c
(print_status): Check the correct variable in assertion.
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=1687530&r1=1687529&r2=1687530&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Thu Jun 25 14:18:50 2015
@@ -287,7 +287,7 @@ print_status(const char *target_abspath,
SVN_ERR(svn_wc__get_tree_conflict(&desc2, ctx->wc_ctx,
local_abspath, pool, pool));
- SVN_ERR_ASSERT(desc != NULL);
+ SVN_ERR_ASSERT(desc2 != NULL);
tree_conflict = svn_client_conflict_from_wc_description2_t(desc2,
pool,
