ready to merge trunk over SAMBA_3_0 ?

[Gerald (Jerry) Carter]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 2 Feb 2006, Andrew Bartlett wrote:

> 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.

It will be a large change but so was the winbind rewrite, the oplock 
rewrite, the rpc rewrite, the service & event log code, the registry 
changes, print migrator, etc....  The current changes ar eon par with 
previous work we have done.

The concern was not over the amount of change but rather the upgrade path.  
And I think I'm pretty convinced that the benefits of any 3.2 release 
would be extremely small when conpared to the overhead.

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

Not for this type of merge.  You guys are talking like I don't have a clue
about svn.  I spend as much time as anyone else on the team with it.
Give me a little credit here.  I know what I'm doing.

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

No.  Then we loose *all* the history on all the previous files (which may 
not have been changed in trunk).  There's no need to change how we have 
done this in the past. I don't really see any point is continuing to beat 
a dead horse here.





cheers, jerry
=====================================================================
I live in a Reply-to-All world.               -----------------------
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: For info see http://quantumlab.net/pine_privacy_guard/

iD8DBQFD4aOlIR7qMdg1EfYRAtT9AJ44b51RJorm68NXSPMoAz4LS67TFwCcDlS5
oNQQZ+EezFtVXC2GwAUe/fQ=
=VM8d
-----END PGP SIGNATURE-----