Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Tree conflicts raised by third-party software [was: branch tc_url_rev: almost ready to merge]

subversion
Discussion topic

Back to topic list

Tree conflicts raised by third-party software [was: branch tc_url_rev: almost ready to merge]

Author julianfoad
Full name Julian Foad
Date 2008-11-25 08:41:05 PST
Message On Tue, 2008-11-25 at 17:07 +0100, Stephen Butler wrote:

> > I get a bit muddled about public/private considerations. I argued that
> > the add/del/get-tree-conflict functions should be private to Subversion.
> > Now we are adding tree conflict data to this structure that is already
> > public, and we are considering whether to keep its alloc and dup
> > functions private. I think the answer here is that that alloc and dup
> > functions are "part of" the proper semantic definition of a data
> > structure. Note that C++ requires[1] an alloc function ("constructor")
> > and a dup ("copy constructor") for every class. The semantics and
> > backward-compatibility issues of these functions are simple, so there
> > should be no problem with making them public. A client might want to
> > keep copies of these structures outside the pool that we provide them
> > in, so there is a need for them to be public.
> >
> > Neels made them public in the branch.

> I was talking yesterday with Nico Schellingerhout, creator of the
> trumerge tool for tree conflict handling in Subversion 1.4, and BTW a
> customer of ours (elego's). He suggests that a new version of
> trumerge for svn 1.6 could look for cases that we don't yet catch
> (such as use case 5) and use the working copy library to set new
> tree conflicts.
>
> Is it possible for a third-party tool to create a new tree conflict?

Yes, if built against our source code. Such a tool can use any of the
project-scope APIs including those in
"subversion/include/​private/svn_wc_priva​te.h", which is where
svn_wc__add_tree_conflict() is. I think that is the only API necessary
to raise a tree conflict.

To make the API accessible at link time, we could make it public.

I'll have a look and see if I can see more accurately what is possible.

Certainly I had not been expecting third-party tools to try to raise
tree conflicts, so haven't had this in mind as a requirement.

- Julian

« Previous message in topic | 8 of 23 | Next message in topic »

Messages

Show all messages in topic

branch tc_url_rev: almost ready to merge neels Neels Janosch Hofmeyr 2008-11-23 20:23:08 PST
     Re: branch tc_url_rev: almost ready to merge neels Neels Janosch Hofmeyr 2008-11-23 22:02:22 PST
         Re: branch tc_url_rev: almost ready to merge julianfoad Julian Foad 2008-11-24 04:23:26 PST
             Re: branch tc_url_rev: almost ready to merge stsp Stefan Sperling 2008-11-24 07:05:24 PST
                 Re: branch tc_url_rev: almost ready to merge julianfoad Julian Foad 2008-11-25 03:34:29 PST
                     Re: branch tc_url_rev: almost ready to merge stsp Stefan Sperling 2008-11-25 03:34:25 PST
                     Re: branch tc_url_rev: almost ready to merge sbutler Stephen Butler 2008-11-25 08:07:16 PST
                         Tree conflicts raised by third-party software [was: branch tc_url_rev: almost ready to merge] julianfoad Julian Foad 2008-11-25 08:41:05 PST
                             Re: Tree conflicts raised by third-party software julianfoad Julian Foad 2008-11-28 11:40:18 PST
                                 Re: Tree conflicts raised by third-party software neels Neels Janosch Hofmeyr 2008-12-09 20:14:01 PST
                                     Re: Tree conflicts raised by third-party software markphip Mark Phippard 2009-01-07 14:44:37 PST
                                         Re: Tree conflicts raised by third-party software "David Glasser" <glasser at davidglasser dot net> "David Glasser" <glasser at davidglasser dot net> 2009-01-07 17:38:00 PST
                                             Re: Tree conflicts raised by third-party software neels Neels Janosch Hofmeyr 2009-01-07 19:29:56 PST
                                                 Re: Tree conflicts raised by third-party software jerenkrantz Justin Erenkrantz 2009-01-07 20:14:55 PST
                                                     Re: Tree conflicts raised by third-party software "David Glasser" <glasser at davidglasser dot net> "David Glasser" <glasser at davidglasser dot net> 2009-01-07 22:43:48 PST
                                                         Re: Tree conflicts raised by third-party software neels Neels Janosch Hofmeyr 2009-01-08 15:10:08 PST
                                                             Re: Tree conflicts raised by third-party software stsp Stefan Sperling 2009-01-08 15:22:41 PST
                                                                 Re: Tree conflicts raised by third-party software julianfoad Julian Foad 2009-01-09 07:01:31 PST
                                                                     Re: Tree conflicts raised by third-party software markphip Mark Phippard 2009-01-09 07:08:29 PST
             Re: branch tc_url_rev: almost ready to merge neels Neels Janosch Hofmeyr 2008-11-24 21:52:44 PST
                 Re: branch tc_url_rev: almost ready to merge stsp Stefan Sperling 2008-11-25 03:21:31 PST
                 Re: branch tc_url_rev: almost ready to merge julianfoad Julian Foad 2008-11-25 04:32:31 PST
     Re: branch tc_url_rev: almost ready to merge stsp Stefan Sperling 2008-11-24 03:56:40 PST
Messages per page: