Re: How to cope with patches sanely
On Fri, 01 Feb 2008, Kumar Appaiah wrote:
> On 01/02/2008, Raphael Hertzog wrote:
> > 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/.
> Dear Raphael,
> Is this what you mean?
> - Have a branch upstream, and upstream-patched
> - Make upstream stay in sync with the upstream tarball. Merge it with
No, I said "rebase" and not merge.
(Note that this means that nobody should derive from upstream-patched as
the branch is regularly rewritten and one can't branch and later merge
> - Use the differences between these branches to generate
Yes. git rev-list upstream..upstream-patched would give a list of commit
to use to generate the debian/patches/
Le best-seller français mis à jour pour Debian Etch :