ready to merge trunk over SAMBA_3_0 ?

[Gerald (Jerry) Carter]

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

Andrew Bartlett wrote:

> Also, is there a sane SVN way to do the merge, so we 
> keep history?

No.  The merge is basically one bigpatch.  The history
stays in trunk.  SAMBA_3_0 just sees one really large
commit.





cheers, jerry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFD4Q5XIR7qMdg1EfYRAilLAKDw+mSZp4yxbDmGXVXweZz85WTuqwCgm2fo
D+98sILsdqLIXCdTLNuomxE=
=VYQ3
-----END PGP SIGNATURE-----