Technical details of the branch merging

Kai Blin kai at samba.org
Mon Sep 8 12:14:53 GMT 2008


On Monday 08 September 2008 13:45:44 simo wrote:
> 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 ?

Well, if I get the way tags work right, tags link to a commit object. As we 
didn't delete the old commit objects and fetched them into the new 
repository. So if you follow a tag, you will get the old, unchanged commit 
object. As the old objects are all there, the old tags still work as well.

Cheers,
Kai



-- 
Kai Blin
WorldForge developer  http://www.worldforge.org/
Wine developer        http://wiki.winehq.org/KaiBlin
Samba team member     http://www.samba.org/samba/team/
--
Will code for cotton.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.samba.org/archive/samba-technical/attachments/20080908/4cf81164/attachment.bin


More information about the samba-technical mailing list