How to merge changes made on a branch?

[Roger Ye]

Hi all,

 

Here I have a branch prod_dev (not head), and prod_dev itself also has

a branch named prod_dev_br, now some changes are made on the

sub-branch prod_dev_br, and I want to merge the changes back to

the branch prod_dev, and any changes made on the sub-branch should

be ignored, then is it possible to execute a single cvs command to achieve

this? I have already checked out the project from branch prod_dev

 

Afterwards can I use the following command to merge/override?

cvs up -CdP -jprod_dev_br my-module

Is it the same as the following one?

cvs up -CdP -jprod_dev -jprod_dev_br my-module

 

Or I must have a tag which marks where the sub-branch was made?

 

 

The second question is if lots of changes have been made on

the sub-branch, especially in case of many new dirs and new files,

how can I quickly commit all the changes to the branch prod_dev?

how do you guys performed such operation?

 

Thanks

 

--
Worry a little bit every day and in a lifetime you will lose
a couple of years. If something is wrong, fix it if you can.
But train yourself not to worry. Worry never fixes anything.
                                          -- Mary Hemingway