[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: Stefan Sperling <stsp_at_elego.de>
Date: 2007-11-21 00:12:56 CET

On Tue, Nov 20, 2007 at 04:30:41PM -0500, David Glasser wrote:
> 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.
> > >
> > Is there a version bump imminent for other reasons than tree-conflicts?
> There is a version bump in version 1.5.

Does adding a new wcprop imply a working copy format version bump?

Looking at the comments in libsvn_wc/wc.h that talk about version
bumps, it seems as if it didn't.

> 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...

No one wants to add yet another huge feature before 1.5 is

Michael Pilato phrased it well in <47432D47.6060400@collab.net>,

  Since the situation is arguably a bug (and therefore a candidate
  for resolution in a patch release), if a solution can be provided
  in a patch release while obeying our API compatability constraints,
  then on the assumption that 1.5.x will be released before 1.6.0,
  it makes for a good thing to target.

So ideally, we'd like to have a place to store tree conflict information
that is backwards-compatible and does not require wc format changes.
It looks like wcprops were suitable -- is this assumption correct?

> The choice between wcprops and entry fields should be made based on
> which is more appropriate for the feature, not version bump reasons.

I don't really see a functional difference between using a wcprop
or a field in .svn/entries to store tree conflict information for
a directory. From a functional point of view, both just store a byte
string, it's just that the API to access either is different.

Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on Wed Nov 21 00:13:29 2007

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.