how to cherry-pick revisions from SAMBA_3_2?
Gerald (Jerry) Carter
jerry at samba.org
Sat Oct 13 16:43:29 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
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
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
-----END PGP SIGNATURE-----
More information about the samba-technical