[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: last minute fixes
From: |
Thomas Tanner |
Subject: |
Re: last minute fixes |
Date: |
Sat, 28 Apr 2001 12:46:47 +0200 (CEST) |
Hi
On 27-Apr-2001 Alexandre Oliva wrote:
>> Hmm. Isn't that equivalent to commiting the current contents of the
>> MLB into HEAD?
> Yep. Isn't that exactly what we want to do in order to eventually
> terminate the branch?
IMO overwriting HEAD with MLB (which is still not up-to-date with HEAD)
is not The Right Way (tm) to merge both branches because we loose a lot of
new code which is only in HEAD.
I think we should either merge new code (including the ltconfig removal)
from HEAD to MLB while keeping HEAD in deep-freeze or
do it the other way around, which is probably easier and would
allow us to apply new patches to HEAD while keeping MLB in deep-freeze.
Thomas Tanner -------------------------
email: tanner@(ffii.org|gnu.org|gmx.de)
web: http://home.pages.de/~tanner
UMI: http://umi.ffii.org
- Re: last minute fixes, (continued)
- Re: last minute fixes, Thomas Tanner, 2001/04/25
- Re: last minute fixes, Gary V . Vaughan, 2001/04/25
- Re: last minute fixes, Alexandre Oliva, 2001/04/26
- Re: last minute fixes, Gary V . Vaughan, 2001/04/26
- Re: last minute fixes, Alexandre Oliva, 2001/04/27
- Re: last minute fixes, Gary V . Vaughan, 2001/04/27
- Re: last minute fixes,
Thomas Tanner <=
- Re: last minute fixes, Gary V . Vaughan, 2001/04/28
- Re: last minute fixes, Thomas Tanner, 2001/04/30
- Re: last minute fixes, Ossama Othman, 2001/04/30
- Re: last minute fixes, Thomas Tanner, 2001/04/27
- Re: last minute fixes, Gary V . Vaughan, 2001/04/27