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

[simo]

On Mon, 2008-09-08 at 09:59 +0200, Stefan (metze) Metzmacher wrote:
> Kai Blin schrieb:
> > 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:
> > http://gitweb.samba.org/?p=kai/samba/franky.git;a=summary
> > 
> > If people are fine with this tree, I'd propose we switch development to this 
> > tree.
> 
> There's more work to do before we can switch over...
> 
> 1. we need to make v4-0-test and v3-devel readonly
>    update the sX-rename branches and to the merge again.
> 
> 2. should be merged branch be named 'master'?

Given that both v4-0-test and v3-devel are used as they were 'master' I
think it would be advisable to sue this standard name for the master
branch.

> 3. we need to update the build-farm scripts to
>    use source3 and source4

What about v3-0-stable/v3-2-stable ? Are they converted as well, or do
we keep them as is ?

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Senior Software Engineer at Red Hat Inc. <simo at redhat.com>