[Vim-latex-devel] new CVS branch

[Benji F. <be...@me...>]

Srinath Avadhanula wrote:
> Hello!
> 
> I just got done with an exam. So a little time for vimming. I will
> mostly do the outstanding things like the web-page cvs screw up and a
> few other things. I will also put this new version of imaps.vim into a
> new branch which I shall call... lets see...
> 
> b-newimaps
> 
> (Lets make it convention to name all branch tags with a leading 'b-').
> 
> Next time, keep your old copy of the repository and check out the new
> version into a new directory using
> 
> cvs checkout -r b-newimaps -d newdir

      Make that

$ cvs -z3 -d 
:ext:ma...@cv...:/cvsroot/vim-latex get -r 
b-newimaps -d alpha vimfiles

Replace "macvimx" with your user name and replace "alpha" with whatever 
you like.

> Then newdir will contain the new branch files.
> 
> BTW, branching in CVS is _extremeley_ easy, contrary to popular opinion.
> All that needs to be done is:
> 
> 1. go to the local repository.
> 2. "cvs update" to bring things up to date.
> 3. "cvs tag trunk-<date>" (replace <date> with current date).
>    this step is not essential. But it helps to keep a tagged version at
>    the root of every branch.
> 4. "cvs tag -b b-newimaps"
> 
> thats it!
> 
> then do the checkout thing I mention earlier.
> 
> Further reading:
> 
> http://cvsbook.red-bean.com/cvsbook.html#Branches
> 
> The link has a very nice explanation of all these concepts, including
> ofcourse how to merge changes from the branch onto the trunk.
> Recommended reading for any hacker :)
> 
> ------ IMPORTANT ---------
> Its very important to tag the whole branch repository every time a
> change from it is merged into the main trunk. I suppose we should
> somehow automate this...
> 
> This is important because if we want to merge from the branch onto the
> main trunk more than once, then we cvs needs to know the 2 revs from
> which it calculates the diff.
> ------ IMPORTANT ---------
> 
> In the web cvs, you will need to select the correct branch to view the
> branch versions of the files.
> 
> Hopefully, this email will serve as a future short reference for cvs
> branching. 
      Yes, hence the new subject line.  I apologize:  you sent us 
directions before, but that was when I had just installed Linux, and I 
only kept one copy, and I had problems ...  (Note to self:  time for a 
backup!)

					--Benji