[RFC] Suggested "combined tree" for easier development and Franky integration.

Kai Blin kai at samba.org
Sun Sep 7 20:46:44 GMT 2008

On Saturday 06 September 2008 21:32:24 Volker Lendecke wrote:
> On Fri, Sep 05, 2008 at 07:07:22PM +0200, Stefan (metze) Metzmacher wrote:
> > > We need to discuss how to handle the remaining
> > > duplicates from the old Samba3 and Samba4 trees. I'm
> > > looking forward to suggestions on how to improve the
> > > migration guide as well.
> >
> > I like the concept, but let us (me) redo the
> > git-filter-branch thing so that each new commit has a
> > reference to the old sha1 in it.
> Find the newly converted trees on
> http://git.samba.org/?p=vl/samba.git/.git;a=summary

And the newly generated merge tree at:

If people are fine with this tree, I'd propose we switch development to this 


Kai Blin
WorldForge developer  http://www.worldforge.org/
Wine developer        http://wiki.winehq.org/KaiBlin
Samba team member     http://www.samba.org/samba/team/
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 : http://lists.samba.org/archive/samba-technical/attachments/20080907/beecb8a8/attachment.bin

More information about the samba-technical mailing list