Re: last minute fixes

[Gary V . Vaughan]

On Thursday 26 April 2001  6:27 am, Alexandre Oliva wrote:
> On Apr 25, 2001, "Gary V. Vaughan" <address@hidden> wrote:
> > Alexandre had agreed to do the merge -- once immediately following the
> > 1.4 release, and then again after I had completed the
> > ltconfig->libtool.m4 conversion.  However, if you want to do the merge,
> > he might be happy to relinquish...
>
> Absolutely.
>
> My plans for the merge were as simple as `
>
> % cd branch; cvs tag branch-merged-into-mainline
> % cd ../head; cvs update -j HEAD -j branch-merged-into-mainline
> % cvs commit

Hmm.  Isn't that equivalent to commiting the current contents of the MLB into 
HEAD?  Or is cvs clever enough to point out all the conflicts for you to sort 
out before you can do the commit?

> The tag will make it possible for us to do the next round of merging
> easily.

Good idea.

> BTW, Gary, did you create a 1.4 branch off the release tag?  We should
> probably do so.

Yup: branch-1-4.

I'm not inclined to apply any more patches while we would need to keep HEAD, 
branch-1-4 and HEAD all in synch' (that doesn't mean everyone should be as 
lazy as me ;-)  I'll flush the patch queue once we have obsoleted MLB.

Cheers,
        Gary.
-- 
  ___              _   ___   __              _         mailto: address@hidden
 / __|__ _ _ ___ _| | / / | / /_ _ _  _ __ _| |_  __ _ ___       address@hidden
| (_ / _` | '_|// / |/ /| |/ / _` | || / _` | ' \/ _` | _ \
 \___\__,_|_|\_, /|___(_)___/\__,_|\_,_\__, |_||_\__,_|//_/
home page:  /___/                      /___/                  gpg public key:
http://www.oranda.demon.co.uk           http://www.oranda.demon.co.uk/key.asc