How do I merge Heimdal to Samba4 using GIT?

[Stefan (metze) Metzmacher]

Stefan (metze) Metzmacher schrieb:
> Hi Andrew,
> 
>> I've forgotten how to do the heimdal import.  Can you point me a some
>> instructions?
>>
>> Given the requests we have had to improve the Heimdal we carry, and the
>> fact that most of our changes have been merged, it would be great to get
>> this in for an alpha in the next week or two.
>>
> 
> I prepared this branches:
> 
> A rebased lorikeet branch on top of the heimdal trunk from yesterday.
> http://gitweb.samba.org/?p=metze/heimdal/wip.git;a=shortlog;h=refs/heads/lorikeet-heimdal-200903260854
> 
> This above branch imported into samba4.
> http://gitweb.samba.org/?p=metze/samba/wip.git;a=shortlog;h=refs/heads/import-lorikeet-heimdal-200903260854
> Here a lot of tests fail in make test...
> 
> The rebase-lorikeet.sh and import-lorikeet.sh scripts are added to here:
> http://gitweb.samba.org/?p=metze/heimdal/wip.git;a=shortlog;h=refs/heads/lorikeet-heimdal-next
> 
> If you use the scripts please read them before.
> 
> currently you should pass lorikeet-heimdal-next as argument to
> rebase-lorikeet.sh, as there I already resolved conflicts, which you'll
> get if you try to rebase the default branch 'lorikeet-heimdal' from here
> http://gitweb.samba.org/?p=metze/heimdal/wip.git;a=shortlog;h=refs/heads/lorikeet-heimdal

Sorry it has to be 'heimdal-metze-wip/lorikeet-heimdal-next' instead of
the default 'heimdal-metze-wip/lorikeet-heimdal'.

> If you created *lorikeet-$DATE branches, please push them to a private
> repo, so that I can copy them over to my repo later.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.samba.org/archive/samba-technical/attachments/20090328/7b55e362/signature.bin