Re: Ad-hoc survey of existing Debian git integration tools
On Mon, 2015-08-03 at 14:37 -0400, Barry Warsaw wrote:
> On Jul 21, 2015, at 06:46 PM, Ian Jackson wrote:
>
> >That is, the dgit git tree contains the patches in debian/patches/
> but
> >also contains the implied changes in the main source code. If you
> add
> >commits yourself to the dgit git tip, new patches will generated
> from
> >your commits.
>
> I think then that dgit's requirements are not compatible with git-dpm
> currently. IIUC, git-dpm presents you with either a
> patches-unapplied-but-with-debian/ view, or a patches-applied-no
> -debian/ view.
>
> E.g. `debcheckout python-pip`
I'm looking at "debcheckout grub2" since it is one I'm a bit familiar
with.
> You'll be in the master branch which is the packaging branch, but `quilt
> applied` returns nothing, and `quilt unapplied` shows you that the patches are
> not yet applied.
But git log shows that they are, it's just that Quilt is unaware of
this (no .pc directory in git). Perhaps grub and python-pip differ here
but I don't think so.
AIUI this is compatible with dgit, although I've not tried it.
BTW, IIRC Colin had somewhere (on his blog?) a script which could
reconstruct a .pc, although I think with git-dpm you never actually
need to use quilt, since you should instead be git-dpm checkout-patched
+ git rebase.
FWIW "apt-get source grub2" does create the .pc directory.
Ian.
Reply to: