Samba3 / Samba4 merge (Re: Technical details of the branch merging)

Kai Blin kai at
Fri Sep 12 22:26:31 GMT 2008

On Friday 12 September 2008 17:12:51 Stefan (metze) Metzmacher wrote:
> Kai Blin schrieb:
> > As I threatened in my "[RFC] Suggested "combined tree" for easier
> > development and Franky integration.", here's the technical details of the
> > branch merging.
> I would like do the final conversion on Monday morning german time,
> if nobody complains.
> I've created a master branch of the updated s3-rename / s4-rename branches:
> I plan to reject push access to v3-devel and v4-0-test,
> then update s3-rename and s4-rename and finally redo the merge
> and push the result as 'master' branch to our main
> repository.
> Then I'll update the build-farm to build samba_4_0_test and
> samba_3_X_test both from the new master branch.
> Comments please!

Sounds good. :)


Kai Blin
WorldForge developer
Wine developer
Samba team member
Will code for cotton.
-------------- 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 :

More information about the samba-technical mailing list