[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: Greg Stein <gstein_at_gmail.com>
Date: 2007-03-23 00:08:56 CET

Hawt!!

On 3/22/07, Daniel Rall <dlr@collab.net> wrote:
> On Thu, 22 Mar 2007, Daniel Rall wrote:
> ...
> > > > >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
>
> The merge to trunk was completed in r24027.
>
>

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 23 00:09:07 2007

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