Technical details of the branch merging

simo idra at samba.org
Mon Sep 8 11:45:44 GMT 2008


On Mon, 2008-09-08 at 09:25 +0200, Kai Blin wrote:
> On Monday 08 September 2008 01:27:59 simo wrote:
> > On Fri, 2008-09-05 at 23:35 +0200, Kai Blin wrote:
> > > Last but not least, we want to fetch the old tags, so we need a final
> > >
> > > $ git fetch --tags ~/samba3
> >
> > What about the samba4 tags ?
> 
> Technically both ~/samba3 and ~/samba4 contain all the tags the repo I cloned 
> from contain, which is git://git.samba.org/samba.git. However, I admit that I 
> should have written
> 
> $ git fetch --tags git://git.samba.org/samba.git
> 
> as the main repo more obviously contains all the tags.

And this will correctly apply to both samba3 and samba4 code ?
I was just worried that samba4 tags would not reference ~/samba4 code,
but I am not that expert in git, so maybe this is all taken in account
by the merge code.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Senior Software Engineer at Red Hat Inc. <simo at redhat.com>



More information about the samba-technical mailing list