Re: Referring the base of a branch

[Spiro Trikaliotis]

Hello Derrick,

* On Thu, Jun 16, 2005 at 06:39:35PM -0700 Derrick Bass wrote:

> I did something dumb and created a branch without tagging the base of  
> the branch first. Now I want to merge the changes on the branch into  
> the mainline, but I can't figure out a way to refer to the base of  
> the branch in a cvs update statement. (Using -j Branch-name gets me  
> the tip, of course.)
> 
> Is there a way to that? If not, what's the best way to merge the  
> changes?

I'm no expert on the CVS file format, so be warned to test any
manipulation I suggest on a copy of your repository, not on the
repository itself!

You can get to the revision of each file where it was branched rather
quickly. Do the following:

- FOR each "file" DO:
    - cvs log "file"
    - grep the branch name out of the output of the above
      (for example, you get something like
         "    branch: 1.164.0.14"
    - Get the number from above and remove the "0" and the number after
      it. This is the base where the branch was created. For example,
      here, we get "1.164"
    - Now, tag the file on this revision:
      cvs tag TAGNAME -r 1.164 "file"

As I told you, this SHOULD work, but I cannot be held reliable if it
does no!. Thus, again, I advice you to test it with a copy of you
repository, and wait if someone here corrects my posting. :-)

HTH,
   Spiro.

-- 
Spiro R. Trikaliotis                              http://cbm4win.sf.net/
http://www.trikaliotis.net/                     http://www.viceteam.org/