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.
- application/pgp-signature attachment: stored
Received on Thu Mar 22 22:31:02 2007