CVS Branch Differencing and Merging

[Bryant Kwon]

Hi everyone,

 

I've been able to compare changes in files between the branch and the main trunk.  However, I need a set of commands (or scripts) which will:

 

1. list the differences between the current file on the branch and the current file on the trunk

 

2. merge the current file *from* the trunk into the current file in the branch.

 

We have one branch for our "release version" of our software off of our main trunk.  We continue doing development on the trunk and sometimes we'll have a bug fix which we would like to merge onto the "release" branch.  However, we do not want to merge new features implemented on the trunk since the last release into the branch at the same time.. just wish to merge the bug fix portion of it.  Can such merges under contstraints be done in CVS?

 

I've read on the FAQ someone suggested just copying over the files when going from trunk to branch... I was just wondering if there are other alternatives.

 

Thanks in advance for your help!

Bryant