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

Re: Tree conflicts raised by third-party software

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 9 Jan 2009 00:22:30 +0100

On Fri, Jan 09, 2009 at 12:10:03AM +0100, Neels Janosch Hofmeyr wrote:
> Hi Tree-conflicts folks,
> are we fine with making svn_wc__add_tree_conflict() public for the sake of
> the svnraisetreeconflict commandline tool?

There's already good use for it, so I don't see why not.

Either just make it public, or add a public wrapper in libsvn_client
(some people have argued that the WC API should never have been public,
but I guess the cat is out of the bag now anyway, so I'm fine with
either approach).

> Answering `yes' here suggests that ...__remove_tree_conflict() and such
> should also go public.

I'm not sure people would really want to remove conflict markers
in other ways than using 'svn resolve' or the equivalent command
in their GUI. At least I have not heard of such use.

And what's "and such"?

Received on 2009-01-09 00:22:55 CET

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