Re: Removing branch from an individual file

[Pierre Asselin]

Sanjay Goel <address@hidden> wrote:

> 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.

You could do

    cvs admin -Nthe_branch_tag:1 the_file

(I think there is a better syntax for that now, but I'm not sure.)

This will make your branch synonymous with the trunk, for this
file only.  Changes committed to the trunk will be visible on
the branch as well.

If there are unmerged changes on the branch you should
merge them first because it will become more difficult
once the branch tag is modified.


-- 
pa at panix dot com