[Pkg-puppet-devel] Cherry picking 865282a from upstream branch

[Mathias Gug]

Hi,

Excerpts from Stig Sandbeck Mathisen's message of Mon Aug 02 20:26:11 -0400 2010:
> Mathias Gug <mathiaz at ubuntu.com> writes:
> 
> > While working on integrating puppetmaster with mod-passenger I ran
> > into a bug that was fixed in the upstream git repository:
> >
> >   865282a Fixed example config.ru
> >
> > Which git commands should I run to cherry pick the fix from the
> > upstream git repository into the debian git branch?
> 
> First, both the "master" and "upstream" branches are available from the
> debian repo.  Add a remote, and fetch the two named branches:
> 
> git remote add -f -t master -t upstream -t pristine-tar debian \
>                git://git.debian.org/pkg-puppet/puppet.git
> 
>

I don't see that will get the new upstream puppet.git content. IIUC at
some point I need to pull from puppet git repository [1] to get the
commit (865282a) I wanna commit.

[1]: http://github.com/reductivelabs/puppet.git

> Then, you do:
> 
> ##############################
> 
> Short version:
> 
> git checkout master
> git cherry-pick 865282a
> 
> ##############################

I've tried that and 865282a is unknown (which makes senses as I've
never pulled from the upstream git repository).

> 
> This mail got longer than I intended it to be :)

I'm grateful you've taken the time to outline some of your workflow. I'm
not used to packaging with git yet and it seems that there are all kinds
of workflows out there.

It may be useful to add a README.source file to the debian/ directory to
outline common tasks performed via git:
 * update to a new upstream version
 * cherry pick a patch from the upstream repository
 * fixing a bug/working on a feature using topic branches

Thanks,

-- 
Mathias Gug
Ubuntu Developer  http://www.ubuntu.com