How do I merge Heimdal to Samba4 using GIT?

[Andrew Bartlett]

On Sat, 2009-03-28 at 08:05 +0100, Stefan (metze) Metzmacher wrote:
> 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.

I've done so in
ssh://git.samba.org/data/git/abartlet/lorikeet-heimdal.git

Now that I've done this, what do I need to do next to correctly import
this into Samba4?

Andrew Bartlett

-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Samba Developer, Red Hat Inc.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20090608/665d2c46/attachment.bin