You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by hw...@apache.org on 2010/10/29 18:42:26 UTC

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

Author: hwright
Date: Fri Oct 29 16:42:25 2010
New Revision: 1028830

URL: http://svn.apache.org/viewvc?rev=1028830&view=rev
Log:
* subversion/svn/status.c
  (print_status): Add an assert.

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=1028830&r1=1028829&r2=1028830&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Fri Oct 29 16:42:25 2010
@@ -163,6 +163,7 @@ print_status(const char *path,
           svn_wc_conflict_description_t *old_tree_conflict;
           SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
                                             local_abspath, pool, pool));
+          SVN_ERR_ASSERT(tree_conflict != NULL);
           old_tree_conflict = svn_wc__cd2_to_cd(tree_conflict, pool);
 
           tree_status_code = 'C';