Re: can anybody review my patchset?
Mark Johnson <[email protected]>
| Newsgroups | gmane.network.djbdns |
|---|---|
| Message-ID | <[email protected]> |
On Thu, May 14, 2009 at 12:55 PM, Jeff King <[email protected]> wrote: > 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. I've actually applied Felix Leitner's IPv6 patch for djbdns to a Subversion checkout of zinq-djbdns. It wasn't actually that bad. The code is all merged in, I've just got to update my Makefile.am. If anybody's interested, I can try and finish that up, test it and ship it.