At work, we try to remain agnostic about the development tools we use. For source code management some teams are using Sourcesafe, others are using Sourcevault, my team is using SVN. Since we are also a Microsoft shop we use TortoiseSVN instead of the commandline tools. There are no problems with them but it's a lot easier to use the GUI.
By default tortoise installs its own diffviewer, tortoisemerge, for viewing and modifying changes. I prefer another. Sourcegear diffmerge provides a better user experience and the text is a lot easier to follow. To set tortoisesvn to use a different diffviewer we open settings and select diff viewer in the External Programs subtree. Select External radiobox.
Enter this text into the dialog box:
Click on Merge Tool and select External radiobox. Enter this into the textbox:
Save and close the dialogbox. Fire up a file that was modified to compare and you'll be using Diffmerge instead of tortoisemerge.
Posted by yardie at March 11, 2008 12:21 PM | TrackBack