Other Diff/Merge Programs

For those that were looking for better diff programs than WinDiff, there are other programs out there that are free and some of those programs focus on specific comparison types. Ex: There are some diff programs that focus on text documents (ex: MS Word) and other that focus on source code compares (ex: C++). Go to the TortoiseCVS frequently asked questions and there are a number of links for different compare software packages if you don’t like the WinMerge that was included in the CD that was passed around.

Recover accidentally removed file

One of the items that was discussed during the tutorial yesterday was the fact that it did not appear that TortoiseCVS allowed a way to recover a file that has been removed from the repository. Within the TortoiseCVS frequently asked questions section this is one of the items that is covered. Here is there response to the question:

Ooops! I accidentally removed a file - how can I get it back? The removed file has been moved to the Recycle Bin (unless you have turned off the Recycle Bin). If you have already committed the removed file, you can simple undo the delete from the Recycle Bin, then add the file again.

If you haven't committed the removed file yet, you have two options: Commit the removed file (i.e. commit the directory), rename the backup copy and add it again. Right-click on the removed file in the commit dialog and undo the removal.