Re: 2.6.25 postrelease trunk upstream sync

[maximilian attems <max@stro.at>]

On Fri, Apr 25, 2008 at 06:53:05PM +0200, Bastian Blank wrote:
> On Fri, Apr 25, 2008 at 06:12:31PM +0200, maximilian attems wrote:
> > On Fri, Apr 25, 2008 at 05:55:48PM +0200, Bastian Blank wrote:
> > > On Fri, Apr 25, 2008 at 01:32:56PM +0200, maximilian attems wrote:
> > > > i'm announcing to sync trunk again with latest git from linus.
> > > My arguments from <20080204161003.GA27513@wavehammer.waldi.eu.org> still
> > > stand.
> > they were refuted subsequently and no one else complained about
> > git handling in contrare.
> 
> Okay, so I announce the following (which will gain us nothing but allows
> me to continue with my work):
> - Add a private branch for infrastructure changes, add it to snapshots.
> - Drop dists/trunk/linux-2.6 from snapshots because it does not have the
>   ressources to build another full set.
> 
> The branch will probably stay at .25 for a long time and merges are
> likely to break really badly.

another option possible for me is that in rc1 time i do a big sync.
git allows me to work on trunk without to much trouble.
merge and conflict resolution is easy.
the thing is you'd probably have to audit 100 or more commit
on one time.

/me takes a look at git svn branching so that maybe i can publish
that in ~people

let's work out a way without having to step on one others toes.
i don't care so much about the snapshot can build on my own.