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

Re: svn commit: r30455 - in trunk/subversion: svn tests/cmdline

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 09 Apr 2008 14:07:39 -0400

David Glasser wrote:
> This commit makes log tests 16 through 19 and blame tests 10 and 11
> fail for me (over ra_local, say) when they run svn merge with errors
> like
>
> subversion/libsvn_client/merge.c:2146: (apr_err=155015)
> svn: One or more conflicts were produced while merging r3:6 into
> '.' --
> resolve all conflicts and rerun the merge to apply the remaining
> unmerged revisions

Sorry about that. I ran the merge_tests only before committing. Fixed in
r30460. 

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-04-09 20:07:50 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.