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

Re: Tree-conflicts branch plans

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 19 Aug 2008 18:50:05 +0200

On Tue, Aug 19, 2008 at 05:00:11PM +0100, Julian Foad wrote:
> On 2008-08-19, Stefan Sperling wrote (in private, with permission to go
> public):
> > Julian, I don't know what your current plans are with the branch,
> > do they go in a similar direction or do you have a different approach?
> > What's your plan? Do you think it's realistic to go for a merge
> > into trunk with the current state + issues #3144 and #3145 fixed?
> That is the direction I'm going in. I've started doing
> tree-conflict-detection stuff on trunk because there's too much changed
> on the branch for me to be able to remember what it all is and it's
> getting stale. I'm trying to review it right now to bring the useful
> parts of it into the trunk.

Sounds great. The review is totally needed anyway. I'll do my best
to answer any questions you might have during review.

Oh, and please don't forget to take a broom, the code is probably
a bit dusty by now ;)

> > Unfortunately I won't be able to participate actively until maybe
> > in a few weeks. :(
> It would be great to have your help then, and I see that Neels who may
> have been a colleague of yours is starting to help now too, which is
> just what I need.

Not just colleague, but awsome friend, too :)


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-19 19:39:35 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.