RE: svn commit: r1686880 - /subversion/trunk/subversion/libsvn_client/resolved.c

[Bert Huijben <be...@qqmail.nl>]

> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: maandag 22 juni 2015 16:43
> To: commits@subversion.apache.org
> Subject: svn commit: r1686880 -
> /subversion/trunk/subversion/libsvn_client/resolved.c
> 
> 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/resolv
> ed.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);
> +

This assertion triggers in quite a few testcases on all buildbots.
[[
At least one test FAILED, checking E:\svn-local\tests\tests.log
FAIL:  externals_tests.py 68: check file external recorded info
FAIL:  info_tests.py 9: svn info shouldn't crash on conflict
FAIL:  merge_tree_conflict_tests.py 25: merge conflict details
FAIL:  move_tests.py 14: move conflict details
FAIL:  prop_tests.py 43: verify dir property conflict details
FAIL:  update_tests.py 80: update conflict details
]]

Are you working on a fix or should we just revert this patch?

	Bert 

Re: svn commit: r1686880 - /subversion/trunk/subversion/libsvn_client/resolved.c

[Stefan Sperling <st...@apache.org>]

On Mon, Jun 22, 2015 at 06:22:50PM +0200, Bert Huijben wrote:
> This assertion triggers in quite a few testcases on all buildbots.
> [[
> At least one test FAILED, checking E:\svn-local\tests\tests.log
> FAIL:  externals_tests.py 68: check file external recorded info
> FAIL:  info_tests.py 9: svn info shouldn't crash on conflict
> FAIL:  merge_tree_conflict_tests.py 25: merge conflict details
> FAIL:  move_tests.py 14: move conflict details
> FAIL:  prop_tests.py 43: verify dir property conflict details
> FAIL:  update_tests.py 80: update conflict details
> ]]
> 
> Are you working on a fix or should we just revert this patch?

Sorry about that. Fixed in r1686893.