merging between trunks and branches

[Mark Smith]

Hi all

I am having a problem with merging between trunks and
branches.

I am using start and end tags to mark features and bug
fixes, for example:

cvs tag SF1
<edit files>
cvs ci –m “Add feature 1”
cvs tag EF1
…
cvs tag SB1
<edit files>
cvs ci –m “Bug fix 1”
cvs tag EB1

Suppose I have the following …

On the main trunk:
Feature 1 – tagged SF1/EF1
Feature 3 – tagged SF3/EF3
Feature 5 – tagged SF5/EF5

On a release branch:
Feature 2 – tagged SF2/EF2
Bug fix 1 – tagged SB1/EB1
Feature 4 – tagged SF4/EF4

I want to merge feature 3 from the main trunk to the
release branch, and then I want to merge bug fix 1
from the release branch to the main trunk.

I have tried many different update –j –j commands but
just cannot seem to get it.

Can anyone help?

Mark.




      
____________________________________________________________________________________
You rock. That's why Blockbuster's offering you one month of Blockbuster Total 
Access, No Cost.  
http://tc.deals.yahoo.com/tc/blockbuster/text5.com