Thanks ,but that wasn't really my question and automatic propagation doesn't sound like a CVS feature. I think my lack of a concrete example is a problem, so let me re-write this with one. Here is what I'm looking to do:
bob made 100s of changes to the R1_5 branch for the admin module bob would like to merge his changes, and only his changes from the R1_5_BRANCH to the HEAD bob can find all of his changes with a command like this cvs rlog -r R1_5_BRANCH -wbob admin viewer the question is: is there a cvs way to construct a merge command from that list or do I need to involve my favorite scripting language and some regular expressions to massage it into tags that I can use for the update/merge command? My idea was this: parse the log to find earliest version for each file in the list and add it to a tag BOB_FIRST_CHANGE parse the log to find the latest version for each file in the list and add it to a tag BOB_MOST_RECENT_CHANGE cvs co -dMergeAdmin admin cvs up -DMergeAdmin -j BOB_FIRST_CHANGE -j BOB_MOST_RECENT_CHANGE admin resolve the conflicts cvs ci -m "merged bob's changes from R1_5" MergeAdmin Is there an easier way or is this the right track? On Tue, Apr 8, 2008 at 9:55 AM, Andy <[EMAIL PROTECTED]> wrote: > You wouldn't. My understanding of CVS is that you would have to > checkout the original head and apply your change there and then commit > it back into CVS. The change should then be automatically propagated > forwards to all the branches and the main trunk checkins made after > the head was created. > -- Peter Kahn [EMAIL PROTECTED] [EMAIL PROTECTED] http://citizenkahn.myplaxo.com Awareness - Intention - Action
