Re: Easiest way to move a branch to the trunk

[Stephen Rasku]

Brian Murrel wrote:

>But what to do about files that are on the head but not in the branch
>and vice versa?  Figure out which ones are which and do some "cvs 
new"
>and "cvs delete"s?
>

If you cvs update -p a file that only exists on the branch it will 
create it.  If you do:

        cvs status new-file
        
it will show:

        cvs server: use `cvs add' to create an entry for local.h
        
If you cvs update -p a file that doesn't exist on the branch, you will 
get a zero length file.

These should be good clues as to which files to add and delete.

By the way, what's with the weird e-mail addresses (e.g. 
address@hidden)?

-- 
Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies