Re: patch management with git
On 08-07-2008, Stefano Zacchiroli <zack@debian.org> wrote:
> On Tue, Jul 08, 2008 at 09:47:04PM +0200, St=E9phane Glondu wrote:
>> This tackles the issue of patches: we should agree on a way of handling =
>=20
>> them inside git repository. I haven't looked at them in detail, but they =
>=20
>
> Ack, we need an agreement on this.
>
> I have no idea if there is already a best practice in Debian about that,
> IMO it is worth asking both on -devel and in the mailing list of
> vcs-pkg. In the meantime maybe Julien can give us a hint on how they are
> doing that with the X.org packages ...?
I am probably a bit old school, but i really like having only debian/ in
.diff.gz.
Having patches in quilt/dpatch/'whatever you want' but in debian/patches
is a good practice to me. IMHO, it helps send these patches to upstream
Most of the time i just attach the corresponding patches to a mail and
send it to upstream.
Having the same patches only in .diff.gz is a way to forget them and i
think git integration will help to forget.
I don't think this is a big deal with autogenerated/copied things like
config.{guess|sub}, but for the rest i won't recommend it.
Concerning the initial manipulation (make a backup of config...) and
restore it, i agree with Stephane -> this is a good practice. Trying to
have a clean cycle (build -> clean = return to initial state) is good
and having .orig.tar.gz different from upstream is not good (i.e. just
to remove files like config.{...}). Of course, this is only my personnal
point of view.
Regards,
Sylvain Le Gall
Reply to: