[Pkg-samba-maint] Need help in cherrypicking upstream fixes

Christian PERRIER bubulle at debian.org
Tue Mar 8 06:05:38 UTC 2011

I need some kind of magic git recipe for dummies.

I would like to cherrypick fixes from upstream's git by browsing the
commit log in a given branch (probably 3.5) and pick patches for bugs
I would like to see fixed in squeeze.

The problem becomes: how should I proceed?

I have a local clone of upstream's git.

I guess I should checkout a branch similar to their 3.5 branch. Then I
should use some magic there to see what history of commits happened
and spot those I would like to use (crossing fingers about upstream
commit messages to be clear about what commit fixes what bug)

What would you guys recommend as "key commands" for this?

PS: alternatively, I can browse upstream Bugzilla and go through fixed
bugs one by one....in hope that each bug logs what commit did fix it. 

PS/2: alternatively, I could try asking in -release whether an upload
of 3.5.8 for squeeze would be acceptable..:-)...I'm personnally deeply
convinced it wouldn't harm and that, at that step of their development
process, upstream minor releases are always better and better.... I'm
however not sure that the quite long log of changes wouldn't horrify
our stable release managers..:-)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110308/10f00c14/attachment.pgp>

More information about the Pkg-samba-maint mailing list