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

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.
Received on 2015-06-22 19:21:54 CEST