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

Re: Recommended git packaging work flow for backports?

Simon Josefsson:
> Hi.  I'm preparing my first backport and couldn't find any information
> on what the best work flow for a Debian package that uses git,
> git-buildpackage, pristine-tar and so on.  Are there any pointers here?
> Should I create a separate branch, pulling in things from 'master' once
> that version has hit testing, update the changelog and maybe modify
> gbp.conf to point at the backport branch, and then build and upload?
> Is anyone working with backports this way?  Any other pitfalls?

I create a branch. Use `git merge --no-ff` from the tag that gets in
testing. Then `dch --bpo`. Most of the time that's the only change that
needs to be recorded.

Configuring dpkg-mergechanglogs(1) helps to make subsequent merge

Lunar                                .''`. 
lunar@debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 

Attachment: signature.asc
Description: Digital signature

Reply to: