help with dist-git

[Curtis Doty]

Yesterday Roland McGrath said:

>> But then that breaks simple things that (mostly) worked with the old
>> cvs/Makefile system.
>>
>>    fedpkg prep
>>    Traceback (most recent call last):
>>     ...
>>    git.errors.GitCommandError: 'git config --get branch.resurrect.merge' returned exit status 1:
>
> Do something like:
>
> 	git config --add branch.resurrect.merge refs/heads/f14/master
>
> to make fedpkg build for f14, or refs/heads/master for rawhide.

Yes, that works just fine after jumping onto a local branch, thanks!


> 'fedpkg switch-branch' is a front-end command that does this magic for you,
> but I don't know exactly how it translates into the underlying git commands,
> so I don't have a recipe.

No, it appears this is only an alternate way of running the 'git checkout' 
after creating the local branch. The 'git config --add' hack is still 
needed.

../C