Re: Removing branch from an individual file

[Larry Jones]

Sanjay Goel writes:
> 
> I have created a branch on my root module, so every file inside it is
> branched as well. Now I want to remove the branch from one of the files so
> that anyone who updates the root module on the branch gets this file from
> the head. Also, this file should get checked-in on the head.
> 
> How can I do this?

You need to make the branch tag an alias for the trunk for that file. 
Something along the lines of:

        cvs admin -N mybranch:1 file

should work.

-Larry Jones

I don't want to learn this!  It's completely irrelevant to my life! -- Calvin