[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Switch to git after all?

On Mon, Apr 07, 2014 at 08:31:11PM +1000, Erik de Castro Lopo wrote:
> Colin Watson wrote:
> > In fact, git-dpm was what finally sold me on converting all my packages
> > to git.  For me, it's streets ahead of previous methods of managing
> > Debian patches in revision control in the same way that 3.0 (quilt) was
> > streets ahead of the various older build-time patch systems.
> Can someone point me to a package managed by git-dpm so I can have
> a look?

Examples from my own package list (which isn't to say nobody else is
using it, it's just that these are ones I happen to have handy):

  openssh (lots of patches)
  dumpet (a small number of patches)
  six (no patches)

They all have Vcs-Git and Vcs-Browser fields.

> One using git-buildpackage would be useful as a comparison.

I don't have examples to hand, but note that there are a couple of
different possibilities here (at least).  You can take the completely
flat approach: use quilt for managing patches, but keep the patch stack
unapplied at commit time and just commit the files in debian/patches/.
(This of course means that when upgrading to new upstream versions you
have to do the quilt push / quilt refresh thing and resolve any
conflicts there.)  Or you can use gbp-pq, which keeps a separate
patch-queue branch and serialises this in I think roughly the same kind
of way that git-dpm does.

I had the impression that git-dpm was better-integrated than gbp-pq from
looking through their respective documentation, but I will admit that I
have not spent much time playing with gbp-pq.

Colin Watson                                       [cjwatson@debian.org]

Reply to: