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

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
> debian-patches

No, I said "rebase" and not merge. 
See http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

(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
from it)

> - Use the differences between these branches to generate
> debian/patches

Yes. git rev-list upstream..upstream-patched would give a list of commit
to use to generate the debian/patches/

Raphaël Hertzog

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

Reply to: