xfs
[Top] [All Lists]

Re: [GIT PULL] XFS update for 2.6.30

To: Felix Blyakher <felixb@xxxxxxx>, Lachlan McIlroy <lachlan@xxxxxxxxxxxxxxxxxxxxxxxxx>
Subject: Re: [GIT PULL] XFS update for 2.6.30
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Fri, 3 Apr 2009 10:02:15 -0700 (PDT)
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, LKML <linux-kernel@xxxxxxxxxxxxxxx>, xfs mailing list <xfs@xxxxxxxxxxx>
In-reply-to: <alpine.LFD.2.00.0904030952220.4130@xxxxxxxxxxxxxxxxxxxxx>
References: <20090331053013.7642414167108@xxxxxxxxxxxxxxxxxxxxxxx> <BD6F95C9-2F2D-49A3-979C-25018E62E416@xxxxxxx> <alpine.LFD.2.00.0904030952220.4130@xxxxxxxxxxxxxxxxxxxxx>
User-agent: Alpine 2.00 (LFD 1167 2008-08-23)

On Fri, 3 Apr 2009, Linus Torvalds wrote:

> 
> 
> On Thu, 2 Apr 2009, Felix Blyakher wrote:
> > 
> > Were there any problems pulling from the xfs repository?
> 
> Sorry, no - just too much email, too many trees to look at, too many 
> people to argue with.
> 
> Pulled.

Side note - I almost unpulled afterwards. 

You've done several apparently totally useless pulls from my tree at 
random points. 

Daily "keep up-to-date with Linus' tree" pulls are _strongly_ discouraged 
(read: if this continues, I'll just stop pulling from you), because it 
makes the history totally unreadable after-the-fact. It has some direct 
technical downsides (it makes it much harder to run "git bisect" and see 
what is going on), but apart from those direct downsides it just makes it 
much harder for me - or anybody else who wants to get an overview of what 
happened - to visualize things when history is messy.

Instead of having a clear nice line of development that says "this is what 
happened to XFS", those merges have basically mixed up all your changes 
with all the random _other_ changes in the tree. 

In other words, having those extra merges makes the graphical tools almost 
useless for getting some kind of "what happened" overview. 

I realize that an occasional back-merge may be required to resolve big 
conflicts early, but they really have to be pretty big and immediate for 
it to be a win. 

                        Linus

<Prev in Thread] Current Thread [Next in Thread>