I know this is not quite the place for this (and if anyone knows of a good CVS/SVN forum, please feel free to respond), but here I go:

I've been tasked with reviving and old project that initially failed (bad DBA). It was released in an off schedule release labeled RCB507B. There's been a lot of development work since then, so I was able to find out exactly what changed by looking at RCB507A (507B was an off-schedule release containing only changes for this project).

My question is probably more for advice, soundness of my techniques...if I create a patch between 507A and 507B (cvs rdiff -r RCB00507A -r RCB00507B webportal-core > webportal_core_mysql_patch) can I use this to update HEAD (remember that there's been a lot of work in some of the projects affected) - looking through the patch I see that it has line numbers which may now be way off. My gut feeling says no (keeping with the numbers, current HEAD will be cut over to RCB512 in a couple of weeks).

Assuming my gut feeling of it can't (reliably) be done, would the best course of action be to just merge head into RCB507B and then merge the changes from the newly updated 507B branch back into head?

Thanks
Jerry