Re: Easiest way to move a branch to the trunk

[Brian J. Murrell]

On Fri, Feb 02, 2001 at 08:56:26AM -0800, Stephen Rasku wrote:
> Brian Murrel wrote:
> 
> I know that this is shutting the barn door after the horses have gone 
> but your new development should have been on the trunk and you should 
> have had stable branch.

Of course.  It was a little more abstract that I previously eluded but
your points are right on.  Both the trunk and the branch were parallel
development, one only cutting edge, the other bleeding edge.  I should
have forseen moving the bleeding edge to the cutting edge though and
did it as you said.

> Since the new development is already on the 
> head this removes the need to merge (or put) new development there.

Right.

> However, to solve your current problem you will have to write a 
> script.  Assuming that you have a workspace already checked out on the 
> head, this is how you put the branch version of a file to the head:
> 
>       cvs update -p -r branch-tag foo.c > foo.c

Looks good.

> You will have to iterate this over every file in the tree.  Once all 
> the files are updated you can check in the whole repository.

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?

Once I have done that I will correct the function of the branches.

Thanx,
b.

-- 
Brian J. Murrell