On Fri, Jul 30, 2010 at 10:08 AM, Chen Lei <supercyper1(a)gmail.com> wrote:
2010/7/30 Remi Collet <Fedora(a)famillecollet.com>:
> Le 30/07/2010 01:07, Jesse Keating a écrit :
>
>>
https://fedoraproject.org/wiki/Using_Fedora_GIT
>>
>> We just might finish up before the 48 hour window is up!
>>
>
> Thanks for that great work !
>
> Just updated my first package. No issue :)
>
>
>
> Could be usefull to have a tips (in the wiki page) on how to apply
> change from a branch to another.
>
> I'm not a git expert, but I used
>
> fedpkg switch-branch f14
> git cherry-pick -e xxxxxx
> git push origin f14:f14/master
> fedpkg build
>
> I don't know if this is the better solution, but it works.
> It seems I can't do this using fedpkg command.
>
It seems there's a small bug in fedpkg, when we switch to a branch
using 'fedpkg switch-branch', we can't use 'git push' directly. I
think 'fedpkg switch-branch f14' should set up brancn f14/master
instead of f14, otherwise we can't push changes easily.
Its a known problem. There's a means to work around it listed in the
yellow box at the top of this page
https://fedoraproject.org/wiki/Using_Fedora_GIT
Peter