Quick Guide: Replace diff/merge tool in Visual Studio Team System with WinMerge

I have been using Visual Studio Team System 2008 for a while now and am really starting to like the tightly integrated source control and work item functionality. One thing I cannot get used to is the basic diff/merge tool.

Quick Guide

This quick guide offers a no frills/get things done approach to replacing the diff/merge tool in Visual Studio Team System with WinMerge. There is a detailed guide for those that want to have a little more detail.

Quick Steps

  1. Download and install WinMerge.
  2. Open the Configure User Tools dialog for Team Foundation based source control in Visual Studio. Tools > Options > Source Control > Visual Studio Team Foundation > Configure User Tools
  3. Add the details for the Compare (diff) Tool by clicking on the Add… button. Extension: .* Operation: Compare Command: C:\Program Files\WinMerge\WinMergeU.exe Arguments: /e /u /wl /wr /dl %6 /dr %7 %1 %2
  4. Add the details for the Merge Tool by clicking on the Add… button. Extension: .* Operation: Merge Command: C:\Program Files\WinMerge\WinMergeU.exe Arguments: /e /u /wl /dl %6 /dr %7 %1 %2 %4

Quick Guide: Migrate a virtual machine from Virtual PC to Hyper-V

The Microsoft VHD (Virtual Hard Disk) image format is used by the following Microsoft virtualisation technologies: Virtual PC 2007, Virtual Server 2005 R2 and Hyper-V. There are however some subtleties when getting a VHD image from one of these technologies to work on another.

Quick Guide

This quick guide offers a no frills/get things done approach to migrating a virtual machine from Virtual PC to Hyper-V. There is also a detailed guide coming for those that want to know the why and not only the how.

Quick Steps

  1. Hyper-V Manager – Create a new Virtual Machine. Use an existing virtual hard disk and specify the location of the vhd file you want to use.
    New > Virtual Machine
  2. Virtual Machine – Uninstall the Virtual Machine Additions which are extensions specific to Virtual PC.
    Control Panel > Programs and Features > Virtual Machine Additions > Uninstall
  3. Reboot.
  4. Virtual Machine – Install Integration Services from the Action menu in the Virtual Machine Connection console.
    Insert Integration Services Setup Disk > Install (from AutoPlay)
  5. Reboot – updates will install.
  6. Virtual Machine – Without this step the mouse will not work within the virtual machine. Restart will result in the mouse working.
    Run > MSConfig > Boot tab > Advanced Options > Detect HAL
  7. Reboot – new hardware will be detected and mouse will work.