[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.5-1-1-g0ecfd13

[Mike Hommey]

On Fri, Oct 22, 2010 at 12:59:31PM -0400, Michael Gilbert wrote:
> On Fri, 22 Oct 2010 18:05:53 +0200, Mike Hommey wrote:
> > On Fri, Oct 22, 2010 at 10:58:44AM -0400, Michael Gilbert wrote:
> > > On Fri, 22 Oct 2010 08:52:26 +0200, Mike Hommey wrote:
> > > > On Tue, Oct 19, 2010 at 07:18:58PM +0200, Mike Hommey wrote:
> > > > > On Tue, Oct 19, 2010 at 01:10:51PM -0400, Michael Gilbert wrote:
> > > > > > Right.  I changed the workflow with those patches (keeping them
> > > > > > unapplied in git), and forgot to unapply the existing patches, which has
> > > > > > led to this issue.  If everything is either applied or unapplied, the
> > > > > > issue should be fixed. Personally I prefer unapplied since it seems
> > > > > > cleaner.
> > > > > 
> > > > > Which makes it necessary to refresh patches by hand if they ever don't
> > > > > apply cleanly (or use quilt). All in all, it makes git rather pointless.
> > > > 
> > > > Another good reason to keep them applied: dpkg-source -b applies them,
> > > > and dpkg-source -x too. It's sad that what you get off git is less
> > > > useful than what you get off dpkg-source.
> > > 
> > > Its fairly straightforward do do a "quilt push -a", isn't it?
> > 
> > And then you manage your patches with quilt. Git is pointless except to
> > keep history, which is sad, because it can do so much more.
> 
> Currently git is being used to merge upstream changes and to keep a
> history of debian packaging changes.  quilt is being used to apply
> and track debian-specific patches, which is how the new source format is
> supposed to be used.  

The new source format is just a format. It doesn't require quilt to be
handled, and there are various tools that are able to generate quilt
patch series from git history, topgit being one of them AFAIUI.

For having used the unapplied quilt patches approach on some packages I
maintain for a while, I can tell you it's a major PITA. I still don't
know why I haven't switched to something else yet for these packages.

Anyways, do as you please.

Cheers,

Mike