[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r27253 - in trunk/subversion: libsvn_wc svn

From: <svnlgo_at_mobsol.be>
Date: 2007-10-18 00:22:49 CEST

Quoting sussman@tigris.org:

> Author: sussman
> Date: Wed Oct 17 11:12:50 2007
> New Revision: 27253
>
> Log:
> Make libsvn_wc enforce conflict-callback API more strictly.
>
> * subversion/libsvn_wc/merge.c
> (svn_wc__merge_internal): throw error if the callback doesn't
> return a result_t object or a merged_file.
>
> * subversion/libsvn_wc/props.c
> (maybe_generate_propconflict): same thing here.
>
> * subversion/svn/cl.h, subversion/svn/conflict-callbacks.c
> (svn_cl__ignore_conflicts): delete crufy old debugging function.
>
>
> Modified:
> trunk/subversion/libsvn_wc/merge.c
> trunk/subversion/libsvn_wc/props.c
> trunk/subversion/svn/cl.h
> trunk/subversion/svn/conflict-callbacks.c
>
> Modified: trunk/subversion/libsvn_wc/merge.c
> URL:

Looks like this change is breaking a few tests:

FAIL: merge_tests.py 1: performing a merge, with mixed results
FAIL: merge_tests.py 31: cherry-pick a dependent change, get conflict
FAIL: merge_tests.py 39: conflict from merge of add over versioned file
FAIL: merge_tests.py 40: conflict markers should match the file's eol style
FAIL: stat_tests.py 22: status on conflicted added file

All fail for the same reason with output:
svn: Conflict callback violated API: returned no results.

Detailed info can be found here:
http://www.mobsol.be/buildbot/win32-xp%20VS2005/builds/2560/step-Test%20fsfs%2Bra_local/0

Lieven

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 18 00:23:29 2007

This is an archived mail posted to the Subversion Dev mailing list.