Re: [ANNOUNCE] GIT 1.5.3-rc7

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 29, 2007, 15:23 UTC
Message-ID: <Pine.LNX.4.64.0708291621120.28586@racer.site>
In-Reply-To: <46D58C02.2070203@eudaptics.com>

Hi,

On Wed, 29 Aug 2007, Johannes Sixt wrote:

Show 8 quoted lines

> Johannes Schindelin schrieb:
> > On Wed, 29 Aug 2007, Johannes Sixt wrote:
> > 
> > > The MinGW port is now at 1.5.3-rc7, too.
> > 
> > Should we switch from  4msysgit.git's devel branch to your master branch?
> 
> No. There are still too many differences.

Right. And I see that there are many more tests failing with mingw.git's master, too. Should have tested that first.

Show 11 quoted lines

> But I think it is time to rebase 4msysgit on top of 'devel' - without 
> the old devel commits, i.e.
> 
> 	git rebase --onto mingw/devel 382210f715
> 
> There is a lot of stuff in 4msysgit.git that is no longer needed or 
> superceded by mingw.git.
> 
> Side note: If you can live with a test suite does not complete without 
> failures you can rebase on top of master and avoid the devel branch. 
> (Think of broken repo when I rebase devel again.)

Hmm.  I really want to avoid that breakage...

To refresh my memory, could you please describe how mingw.git's master and devel branches are handled?

Ciao, Dscho