ready to merge trunk over SAMBA_3_0 ?

[Jeremy Allison]

On Wed, Feb 01, 2006 at 02:03:54PM -0600, Gerald (Jerry) Carter wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Volker Lendecke wrote:
> > On Wed, Feb 01, 2006 at 01:39:03PM -0600, Gerald (Jerry) Carter wrote:
> >> No.  The merge is basically one bigpatch.  The history
> >> stays in trunk.  SAMBA_3_0 just sees one really large
> >> commit.
> > 
> > What about a svn rename of trunk to branches/SAMBA_3_0 
> > after removing that one?
> 
> I don't think that will get you want you want.
> 
> Why is this even any issue?  We've always done the
> trunk -> SAMBA_3_0 merges by simply applying the diff.
> Besides there's a lof duplicated checkins between the
> tho branches anyways.

Yep. Indeed, it's handy having two branches, one as a 
sort of "staging area" for advanced features. Yes, we
can do the same by having private trees, but until we're
using a distributed development environment it's easier
to see how all the proposed changes play well with each
other in HEAD.

Jeremy.