git question

Gerald (Jerry) Carter jerry at samba.org
Sat Jun 30 21:48:40 GMT 2007


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

Volker Lendecke wrote:
> Hi!
> 
> Playing with git: What would be the best way to have two
> trees checked out and compiled at the same time? For 'make
> test' I need samba3 and samba4, sometimes I have
> modifications to samba4.
> 
> Right now I have two local repos. Is there a better way?

Sort of.  Use "git clone -l -s " to create local repos that
share objects.

$ git clone git://git.samba.org/samba
$ cd samba
$ git checkout --track -b 4.0/work
$ git checkout --track -b 3.0/work
$ cd ..

$ git clone -l -s samba samba-3-0
$ git clone -l -s samba samba-4-0

$ (cd samba-3-0 && git checkout --track -b work origin/3.0/work)
$ (cd samba-4-0 && git checkout --track -b work origin/4.0/work)

The resulting work repos can be merged back into your main repo
later.

PS: Someone may have a better suggestion but this is what I do.



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

iD8DBQFGhs+4IR7qMdg1EfYRAno6AKDYg+fyhB5DNQLwy2Gjp894ZGEiZQCfZGb3
0Q/3T7VufYjE98pjJXM6GMU=
=O1O8
-----END PGP SIGNATURE-----


More information about the samba-technical mailing list