Re: Branching woes

[Malcolm Tredinnick <malcolm commsecure com au>]

On Sun, Oct 28, 2001 at 03:43:55PM +0100, Rodrigo Moya wrote:
> On Sun, 2001-10-28 at 21:29, Iain wrote:
> > I want to branch gnome-media 1.0 so I can commit the GNOME2 stuff I have
> > to HEAD, but I don't know cvs well enough to do it.
> > 
> > Could someone please tell me how to do it?
> > 
> yes:
> 
> cvs tag your-tag-name
> 
> to create a tag (read-only). And:
> 
> cvs tag -b your-tag-name
> 
> to create a branch

In general, if you are going to create a branch, it's a good idea to tag
the tree just before you branch with a normal tag. So you end up doing
something like

	cvs tag before_GNOME_1_x
	cvs tag -b GNOME_1_x

The idea behind this is that then it's easy to work out what changes
have been made on the branch and on the trunk since they diverged (since
you have a common tag to do a 'cvs diff' against).

This is not compulsory and failing to do it is not a shooting offence.
But it's useful if you think there are going to be lots of merges
between the two branches, for example.

Cheers,
Malcolm

-- 
Borrow from a pessimist - they don't expect it back.