[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: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Thu, 08 Jan 2009 04:29:44 +0100

David Glasser wrote:
> Wait, we're documenting svn_wc__something as something third-party
> developers should use and rely on???
> --dave

We're using svn_wc__add_tree_conflict(), called from a commandline tool
called svnraisetreeconflict. So far, it was compiled "one of the main svn
tools", but all this is still on a branch anyway.

I've moved the tool to contrib/client-side/svnraisetreeconflict now (r35070,
r35071). Dave, do you still see a problem of any sorts?

So, the tool is now in contrib/client-side, but that is still only on branch
`svnraisetc'. I'd say we can merge to trunk now, putting
svnraisetreeconflict into trunk's contrib/client-side.

Julian, do you agree?


> On Wed, Jan 7, 2009 at 2:44 PM, Mark Phippard <mphippard_at_collab.net> wrote:
>> Is there any reason this cannot just be in trunk? Maybe just put it
>> in contrib if there is concern about making it an "official" command
>> line tool?
>> Mark
>> On Tue, Dec 9, 2008 at 11:13 PM, Neels Janosch Hofmeyr <neels_at_elego.de> wrote:
>>> Hi Tree-conflicts and TruMerge folks,
>>> we've got a commandline tool ready that allows third-party software to raise
>>> tree-conflicts in a working copy. I've reviewed Julian Foad's approach and
>>> all I could add was minor output polishing. I can successfully build and use
>>> the tool to raise a tree-conflict externally, upon which the working copy is
>>> blocked as expected, and the conflict can be resolved as expected.


Received on 2009-01-08 04:30:12 CET

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