CVS is smart - at least when the same lines of code haven't already been changed in HEAD too - then it asks for user intervention to solve the conflict.
Yeah, like making you edit manually all the lines in question :lol:
My proposed solution is this:
Branch: HEAD
--------------------------------------------------------- HEAD
|
|
| Branch: VERSION_1_0
| ------ SNAPSHOT ------------------- UNICODE
I had added a SNAPSHOT_DDDDDD tag (and CVS better had not messed with it! :shock: ) for all the changes beforethe UNICODE conversion. All those files have a specific version.
The CVS HEAD branch hasn't seen much changes recently, anyway - so they probably have exactly the same version number than those branhced (with one or two exceptions maybe).
If they have the same version, copy the respective file from the latest VERSION_1_0 to HEAD.
Ta-da!
Or does CVS do this already? :?