Re: trouble with cvs add

[Pierre Asselin]

Mart?n Marqu?s <address@hidden> wrote:
> El Dom 10 Abr 2005 18:55, Pierre Asselin escribi?:
> > 
> > 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.

> How would this be done?

By deciding ahead of time that the files should be committed to the
branch first, and only then merging that commit back to the trunk.

Starting from a trunk sandbox,

    cvs update -r the_branch_tag

and the sandbox is now on the branch.
Create the files in this sandbox.  Then,

    cvs add file1 file2 ...
    cvs commit

Finally, return to the trunk and merge
    cvs update -A
    cvs update -j the_branchpoint_tag -j the_branch_tag

This "cvs add"s the files to the trunk sandbox

    cvs commit


In your case it is too late to do that since the files
are already present on the trunk.  However, I think
you can make them appear on the branch just by tagging
them like the rest.

    (on the trunk)
    cvs tag -b the_branch_tag file1 file2 ...
    cvs update -r the_branch_tag
    (sandbox is now on the branch and the files should be there)


-- 
pa at panix dot com