Re: can anybody review my patchset?

On Thu, May 14, 2009 at 12:09:56PM -0500, Mark Johnson wrote:

> > Since git is supposed to facilitate diffs between drifting branches,
> > why not use github for all these things?  Are you already?
> 
> I started with Subversion since I was already familiar with it.
> SourceForge recently started offering Git as an option, and I've been
> toying switching to it.
> 
> Gerrit Pape has a Git repo for dbndns somewhere.  It seems Jeff King
> is using Git, too.  I suppose I ought to get with the program.

Git is great, and of course I recommend everyone use it. But it isn't
magical. Yes, it will make it easy to have each patch topic in its own
branch based on stock djbdns, but it won't really make integrating the
patches any easier. Somebody still has to do the really nasty merge
between the IPv6 branch and the other branches, and that merge is going
to have a lot of conflicts that have to be manually fixed.

Git can save the result of that merge for other people to build on top
of, but then you are no longer considering those features as patches
based on stock djbdns. You really have to choose one or the other.

-Peff