I have a couple of comments to add to what Dave mentioned.
The first is that you should have the original reference
code (4.6.2 in your case) and the new version both in there
and to merge via something like
cvs update -j oacs-4-6-2 -j oacs-4-6-3
It really should not be too bad, I merged the changes
from 4.6.0-4.6.3 into HEAD (which I guess could be thought of as a heavily modified 4.6.0) and it was only 2 or 3 days work.
Another quicky solution is to diff the two distributions
(diff -urN and exclude the CVS ids), apply the changes with patch and then check through the rejected patches.
The advatage of this is you can more quickly discard changes to .adp files which are locally modified (which is sometimes
a big source of conflicts in trying to merge).
