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

Re: simple tree conflict detection

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-20 22:30:41 CET

On Nov 20, 2007 3:53 PM, Stephen Butler <sbutler@elego.de> wrote:
> Quoting Erik Huelsmann <ehuels@gmail.com>:
> >
> > Since we already have a wc-version bump on our hands, I'd like to
> > suggest we change the on-disk entries structure where required to make
> > our life as simple as possible. This is -in libsvn_wc- already hard
> > enough.
> >
>
> Hi Erik,
>
> just to clarify your suggestion...
>
> Is there a version bump imminent for other reasons than tree-conflicts?
>
> Instead of using all-wcprops to store tree-conflict data during
> update/merge, should we submit a patch that modifies svn_wc_entry_t in
> include\svn_wc.h?

There is a version bump in version 1.5. However, I can't imagine how
that is relevant to the tree conflicts feature, since I can't imagine
that yet another big feature is going to get into 1.5 before we
branch...

The choice between wcprops and entry fields should be made based on
which is more appropriate for the feature, not version bump reasons.
If this means that you need to do a different implementation for the
mainline version of the feature and for a temporary patch for your
clients, that may be the case...

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 20 22:30:54 2007

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