I decided to call the merge of Revolution and BetterAI ... RevAI. Inventive I know

Anyway, the sources will be posted on the FP along with the following merge guide:
How to merge the RevAI code with future versions of BetterAI by Blake:
First, check out the BetterAI source code from the source forge repository, following the instructions located
here. You should also have the RevAI sources, either the full or the small version depending on how you want to try the merge.
There are two ways forward from here, the first way should be automated once you get it set up while the second way is more foolproof:
First way: Using SVN and the full source download
Follow the merge instructions from the BetterAI source forge page, located
here. I did not go this route, but it should in principle to almost everything for you, you only have to handle cases were Blake and I edited the same lines, of which there are maybe one or two and my changes are always marked.
Second way: Using WinMerge and the small source download
Download a file merging program called WinMerge from
winmerge.org. Also check out the online manual for guide on how to use the various features of the program.
You'll then use the compare folders feature to find which files contain differences. Set the 'Left' folder (files will appear on left side of screen, logically) to either BetterAI or the small version of RevAI, and 'Right' to the other. WinMerge will then determine which files contain differences, and you'll need to merge my added code in RevAI into the BetterAI code.
After you tell WinMerge which folders to compare, it will show you a list of all the files in both and whether they are identical, different, or only in one folder. You now have to go through all of the files that are different. Selecting the first one will bring up a side by side comparison of the two files, with the differences highlighted in yellow.
Where there are differences between the files, merge the RevAI changes into the BetterAI changes only when the changes are commented with "REVOLUTION_MOD start" or "AI_AUTOPLAY_MOD start". All of these changes can be find by searching the RevAI file for '_MOD ' (trailing space is important, rules out _MODIFIER things which show up a lot). Where there are differences not commented like this, either leave the BetterAI code as it is, or merge those changes into the RevAI source code. The only reason to do this is so that you can be sure you've checked out every change and the WinMerge will tell you the files are identical ...
Most of my changes in the .cpp files occur in large blocks where I've added new functions. One note of warning, when I went through using WinMerge there was one large block where some BetterAI changes just before a new function of mine were place in the same block with the new function by WinMerge, and I had to merge this part completely by hand. It shouldn't do that to you now that you're starting with merged code, but it might so make sure you check what's being overwritten before pressing the merge direction arrows.
After you have completed this merge, you are well set up to use the first way in the future.