   More advanced CVS tools
  My company is using good old CVS coupled with tortoise CVS to access it. We do merges with winmerge and everything is good.My problem is that lately we switched to using a open source engine for our new game client and the author doesn't accept patches from the community in general. A new version of the engine came out and we want to use it but we've heavily extended the gui capabilities of the engine. We'd like to merge our changes with the new version but without a list of the file that changed it would be very time consuming and error prone.What I would like is a diff tool at the directory level. Something that could take two directory and tell me what files are different. And then I can check them out with a tool like winmerge and do my thing. I'm pretty sure such a tool must exist, I mean it sounds like a problem a lot of ppl should face but I just don't know of any.I would greatly appreciate any suggestions in this matter. Thanks in advance!   
  WinMerge has a built-in directory diff utility.  It's an option in the File->Open dialog.~BenDilts( void );   ;  Well, I'll be damned heh. Thanks a lot.   ;  imho : try to switch to Subversion, far better versioning system then CVS and also tortoaise supports it!   ;  Subversion is good, but CVS has been around a long time and is a very strong product. I don't think thats what this person asked as they would have the same problem using Subversion. A tool I use for CVS and Subversion is SmartCVS and SmartSVN. It has an amazing merge/diff tool and a nice UI to show history and changes. Its well worth looking into. SmartCVS- Alek   ;  The general process of doing this is commonly called "vendor branches". That might be worth googling for.   