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

[Stefan (metze) Metzmacher]

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'?

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

metze



-------------- 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/20080908/47f92606/signature.bin