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

Re: Merging the tree-conflicts branch to trunk

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 15 Sep 2008 17:46:52 +0100

On Mon, 2008-09-15 at 12:30 -0400, Mark Phippard wrote:
> On Mon, Sep 15, 2008 at 12:27 PM, Julian Foad
> <julianfoad_at_btopenworld.com> wrote:
> > I am merging the tree-conflicts branch to trunk today. This is by no
> > means "finished". Some tree-conflict behaviour is not yet done or not
> > yet as we want it. The merge is to facilitate further work in this area.
> For those that work off trunk builds ... I am assuming that the WC
> format is now bumped due to the new tree-conflict values in entries?

Oh... no. The format of the entries file is changed, but there is no
code to change or use a new format number. Sorry - I remember you
mentioned this a long time ago.

As I understand it, a format number "bump" is required if we're changing
the format. Therefore we have to implement this before merging to trunk,
otherwise existing working copies will be broken. Is that right? (Given
that I can tell you that the code just writes and reads an extra field,
with no special magic to attempt to make it backward compatible.)

Can someone tell me how to implement a format bump?

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-15 18:42:21 CEST

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.