Yeah, that is one of the reasons I have put off merging DCM. K-Mod makes a significant number of AI changes and I dread opening CvPlayerAI.cpp for comparison between it and DCM. I will be sure to get the SVN version before I dive in.
One quick question (somewhat off topic): Concerning the methodology of merging, the way I've been doing it for the larger mods is to do a compare from the merge target (DCM in this case) to vanilla BtS. This establishes a baseline of what the changes are and what files and functions I need to look at. Then I seperate the merge target and my existing SDK files into individual functions, or sections of related code, naming them with comparable names, and do a folder compare to all of them. I then merge them essentially one code block at a time so that I don't accidentally mix something up. I then re-integrate the file sections and compile. It's a time intensive process but seems to pretty robust. For simple merges I don't take it to that extreme and most of the time it's only the really complex files that I do this to (CvPlayerAI for instance). Do you know of any easier method? Is there a merge utility that has a "per function" comparison mode? At a certain point, Winmerge loses it's value as a merge tool. Anything over 1500 diffs dissolves into a bloody mess. And 1500 is very easy to reach when merging anything with K-Mod.