subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1686880 - /subversion/trunk/subversion/libsvn_client/resolved.c
Date Mon, 22 Jun 2015 14:42:57 GMT
Author: stsp
Date: Mon Jun 22 14:42:56 2015
New Revision: 1686880

URL: http://svn.apache.org/r1686880
Log:
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_tree_get_victim_node_kind): Assert that the conflict
   passed in is in fact a tree conflict.

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1686880&r1=1686879&r2=1686880&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Mon Jun 22 14:42:56 2015
@@ -186,5 +186,8 @@ svn_node_kind_t
 svn_client_conflict_tree_get_victim_node_kind(
   const svn_wc_conflict_description2_t *conflict)
 {
+  SVN_ERR_ASSERT_NO_RETURN(svn_client_conflict_get_kind(conflict)
+      == svn_wc_conflict_kind_tree);
+
   return conflict->node_kind;
 }



Mime
View raw message