[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: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 15 Sep 2008 12:30:09 -0400

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?

Mark Phippard
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:30:27 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.