ready to merge trunk over SAMBA_3_0 ?

[Gerald (Jerry) Carter]

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

Andrew Bartlett wrote:

> It is an issue because of how much information 
> we loose.  This is a particularly big merge, and I
> think we should take care to retain the history
> if we can.

We don't loose information.  The history of individual
commits is still in trunk.

> We should do it more often.  I've been using 'svn cp' 
> to merge files from Samba3 to Samba4, and I think
> that where the merge between branches is of 'intact'
> files, we should use that approach.  Where is it the
> wholesale tree, then I think we should have svn merge 
> across the wholesale tree.

I'm willing to listen to suggestions.  But this just
doesn't work.  Have you tried it?

You can only "svn copy" files that don't exist in the
target branch.  So I would have to "svn remove" the
existing files first.  Once you do this, the copied
version only has the history from the original branch
and you have lost the history of the previous file.

I'm not going to spend all day merging individual
commits from trunk to SAMBA_3_0.  It's a wast of time
and duplicates work that has already been done.
The commit history exists in trunk.

I'm not being stubborn about this.  But unless someone
can provide some svn wizardry that I don't know about,
I'll stick to dirdiff/svn merge/svn copy as needed.




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: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFD4RxRIR7qMdg1EfYRAn6VAKCEeYwk1rrgKYpG8SlysBeJsXW1YACgmDkY
sYYyZ3Pc4PJwgGhnh1gbIi4=
=3pCC
-----END PGP SIGNATURE-----