ready to merge trunk over SAMBA_3_0 ?

[Andrew Bartlett]

On Wed, 2006-02-01 at 16:04 -0600, Gerald (Jerry) Carter wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Andrew Bartlett wrote:
> 
> > One advantage would be that we could just copy 
> > trunk to SAMBA_3_2, and avoid all this problem about
> > overwriting the SAMBA_3_0 branch.
> 
> 3.2 is a bad idea.  I'm sorry I ever brought it up.
> 
> But I sense something else at play here but I can't read you.
> Why are you so worried about the merge now when you never
> have been in the past?  What is different about *this*
> time?

Just that I got the (perhaps incorrect) impression that this was a
larger merge, and a more complete merge than has been done before, so a
good chance to use the full facilities of our version control system.

Also, I think that better annotate support is a good thing, and one of
the nice little improvements that SVN has over CVS.

Can we rename the samba3 branch to something else, then svn cp trunk
onto where SAMBA_3_0 was?

> I've committed myself to do whatever testing is needed
> to ensure that the upgrade to 3.0.22 goes smoothly.
> And we are not going to let ourselves be held back because
> we are not confident is our past testing procedures.
> We are going to fix the process and not avoid it
> but going to 3.2.0 so that "Hey!  It's a .0 release.
> What did you expect?"
> 
> >> And let's face, if the linux kernel folks can get by
> >> without 2.7, we can manage the changes needed without
> >> a 3.2.
> > 
> > I'm not convinced the situations are comparable, 
> > but anyway...
> 
> What does that mean?  What exactly is the problem here?
> I'm really surprised that this has become such a big deal.

Perhaps I got the wrong end of the stick, on the size of the changes.
It's nothing compared to Samba4's volume of change, so I should keep
some perspective...

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Student Network Administrator, Hawker College  http://hawkerc.net
-------------- 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/20060202/5818e3af/attachment.bin