[Pkg-xen-devel] git workflow, redux

[Ian Jackson]

Hans van Kranenburg writes ("Re: git workflow, redux"):
> On 08/24/2018 01:27 PM, Ian Jackson wrote:
> > There is no pre-cooked recipe or tool for converting a packaging-only
> > style branch to a git-debrebase branch.  And this kind of surgery
> > involves more a thorough understanding of the gdr branch format than
> > merely using the tool on an existing branch does.
> > 
> > If you would like to try it then you're welcome to, but maybe it would
> > be better for me to do it.  How about I do this today, and push it to
> > a wip branch on salsa for you and Wolodja to take a look at.
> 
> Sure.

I have now done this.  It is in:
   salsa/diziet/dgit/experimental.draft

Some notes:

1. Bugs in git-debrebase

This is the first time I have used git-debrebase on a package whose
patches were in subdirectories.  Evidently it is the first time anyone
else has, either: git-debrebase had some trouble with that.  I think
you can use the git-debrebase in sid/buster to examine my branch, and
you can build it with dpkg-buildpackage, but `make-patches' fails.

I have filed bugs, and fixed them locally and will upload a fixed
git-debrebase over the weekend.  Apologies for selling you on my new
tool and then having it crap out...

2. Autogenerated files

gbp pq, which git-debrebase uses, requires debian/control.  There are
some other things in devscripts etc. which also require
debian/control.  I decided that debian/control should be in git.

There's a commit message explaning the rationale and some future ideas
I have for making this less annoying and less baroque, in the commit
where I edited .gitignore.

Regards,
Ian.

-- 
Ian Jackson <ijackson at chiark.greenend.org.uk>   These opinions are my own.

If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.