2010/7/30 Martin Sourada <martin.sourada(a)gmail.com>:
On Fri, 2010-07-30 at 09:49 +0100, pbrobinson(a)gmail.com wrote:
> Excellent news! Thanks for all the work.
>
> One thing I've never got around to working out how to do in git which
> is different from previous is dealing with branches. Where previously
> it was as simple as changing directories to deal with the various
> fedora releases obviously with real branches now we need to do
> something a little differnet. Could someone update the docs with
> details how to do this? I retried "fedpkg switch-branch f-13" (and
> various other possible branch names) and using a "git branch" didn't
> give me any branches other than master. Could we also add some extra
> branch related commands to indicate things like listing the current
> branch, a list of all branches, and how we would commit a new spec to
> more than one branch.
>
I'm not sure how it works if you do "fedpkg clone -B libfoo", but
probably similar to the CVS setup. If you do just "fedpkg clone" the
branches are managed in git only so the "fedpkg switch-branch f13"
indeed switches you to f13 branch even though it looks like master ;-)
Personally I use "git merge <branch-to-merge-from>" to sync the branches
(if I have same spec for more than one branch).
I think using git merge or git cherry-pick will be better than coping
files from other branch like cvs, git is much smarter than cvs.
Regards,
Chen Lei