how to cherry-pick revisions from SAMBA_3_2?

[Gerald (Jerry) Carter]

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

James Peach wrote:

> Ideally, I would like to use git-diff-tree to figure 
> out which revisions I need, then use git-cherry-pick, to
> merge them up into v3-2-test.

James,  you can checkout the initial-v3-2-unstable tag for
the complete SAMBA_3_2 history and cherry pick from that.

> I can't pull a branch from samba-svnmirror.git 
> into samba.git because they don't have a common ancestry. When
> I try this, I end up with a complete mess. I think the only way
> I could do this is if it were possible to create an empty branch.

You don't need to do the following steps since you can
just use the tag I mentioned above.  But the following
are useful in other situations.

$ git-remote add svnmirror git://git.samba.org/samba-svnmirror.git
$ git-fetch svnmirror

Then you could cherry pick from the svnmirror/v3-2 tree as
needed.






cheers, jerry
=====================================================================
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
"What man is a man who does not make the world better?"      --Balian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHEPWxIR7qMdg1EfYRAgoSAKDLw/Cnvu9iNdBocnjePnZ+YlnRUwCff9T6
sGscI+v7Q4xOC3/wSKFw5Ps=
=1X2B
-----END PGP SIGNATURE-----