Re: trouble with cvs add

[Pierre Asselin]

Mart?n Marqu?s <address@hidden> wrote:

> I have a project with some branches. One of those branches is a
> posible 1.2 release in which we are working out some problems. The
> thing is that I add some files to the HEAD which I need in the 1.2
> release, but I just can't add it to the branch because it says that
> the files (and directories) already exist.

One way is to add them to the branch first, and then merge that change
to the trunk.  But it's too late for that.

I think you can go to a trunk sandbox and "tag -b" the added files
so as to put them on the same branch.  Then go to a branch sandbox
and update.  You may need to give a "-d" flag to the update command.


-- 
pa at panix dot com