ready to merge trunk over SAMBA_3_0 ?

[Gerald (Jerry) Carter]

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





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

iD8DBQFD4RQqIR7qMdg1EfYRAte1AJ9P6rFN9eXLY1JVxKdL6EzRUwYoVwCfUDux
ZkbJagy1FERsN+jEZ6wLbV4=
=i1qo
-----END PGP SIGNATURE-----