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

Re: Subversion 1.5

From: Daniel Rall <dlr_at_apache.org>
Date: 2007-03-22 19:28:50 CET

On Wed, 14 Mar 2007, Daniel Rall wrote:

> On Wed, 14 Mar 2007, Mark Phippard wrote:
>
> > On 3/14/07, Daniel Rall <dlr@collab.net> wrote:
> > >
> > >At last October's Subversion Summit, we the developers defined 1.5's
> > >compelling new feature as Merge Tracking. Let's stand behind our
> > >goal. As Greg says, the most realistic way to achieve this is to pull
> > >the merge-tracking branch into trunk to catalyze our effort around a
> > >compelling new feature. Yes, this is going to break some minor
> > >things. But it will also focus our strength-in-numbers on a tangible
> > >goal which we will reach much, much more quickly than with a couple
> > >developers working independently on a now-mostly-stable branch. The
> > >best way to deliver this new feature is to do it together.
> > >Personally, I'm ready for this as I was not ready after the Summit
> > >(having just become a father).
> > >
> > >I propose:
> > >
> > >1. Karl merges sparse-directories onto trunk.
> > >2. Dan deals with the conflicts on the merge-tracking branch
> > > introduced by Karl's merge.
> > >3. Dan merges merge-tracking onto trunk.
> > >4. Work continues on these features until at least Merge Tracking can
> > > thoroughly handle merge history at any level of a merge target.

Following this plan (step #3), I'll be merging the merge-tracking
branch into trunk today.

I've moved the todo list into the notes file, and re-labeled the list
with pre- and post-1.5 targeted tasks. After the merge, this list
will be available at:

  http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt

  • application/pgp-signature attachment: stored
Received on Thu Mar 22 19:29:17 2007

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