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

Re: How to cope with patches sanely

On Fri, 01 Feb 2008, Ben Finney wrote:
> Raphael, please follow the Debian Mailing List code of conduct
> <URL:http://www.debian.org/MailingLists#codeofconduct>; in particular,
> don't send individual copies of list messages unless specifically
> requested.

If you were using mutt and a right configuration, you would have
an appropriate Mail-Followup-To and those mistakes wouldn't happen... (I
so hate those discussions and remarks about code of conduct for one copy
more of a mail).

> In a VCS with good merging support (most DVCSes fit this description,
> Subversion does not), those "logical patches" can be maintained as
> "feature branches".

Thank you, I know a DVCS can be used. However it's not that easy, one
feature branch might rely on another one and then you have to keep that
ancestry information to be able to generate the diffs properly (and in the
right order).

And as explained somewhere else in this thread, this doesn't scale very
well with dozens of patches.

With git I'd use a "debian-patches" branch that I would rebase on the
upstream branch regularly and would edit history of changes as needed so
that one commit generates one file in debian/patches/.

Anyway, I didn't want to discuss this, but just point out what Daniel was

Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :

Reply to: