Showing posts with label WinMerge. Show all posts
Showing posts with label WinMerge. Show all posts

Custom Visual Basic Filter for WinMerge

This filter is to ignore Resharper files and some other temporary stuff.

name: Custom Visual Basic loose
desc: Suppresses various binaries found in Visual Basic source trees
def: include

f: \.aps$ ## VC Binary version of resource file, for quick loading
f: \.bsc$ ## VC Browser database
f: \.frx$ ##
f: \.dca$ ##
f: \.ctx$ ##
f: \.dll$ ## Windows DLL
f: \.ocx$ ## OLE Control Extension
f: \.exe$ ## Windows/DOS executable
f: \.bak$ ## backup
f: \.usr$
f: \.user$
f: \.pdb$ ## VC program database file (debugging symbolic information)
f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
f: \.resource$ ## Compiled resource file.
f: \.cache$
f: \.obj$ ## VC object module file
f: \.suo$
f: \.vssscc$ ## Source control metadata
f: \.vspscc$ ## Project source control metadata
f: \.user$ ## User settings
f: \.ReSharper$ ## ReSharper data
f: \.xfrm$
f: \.bak$

d: \\cvs$ ## CVS control directory
d: \\.svn$ ## Subversion control directory
d: \\obj$
d: \\bin$
d: \\Debug$

How to use custom merge tool in TFS

Found useful article:
http://www.neovolve.com/post/2007/06/19/using-winmerge-with-tfs.aspx

I will store batch here to be sure it will not lost.
It runs winmerge and correctly exits.

"%PROGRAMFILES(X86)%\Winmerge\WinMergeU.exe" /x /e /ub /wl /dl %1 /dr %2 %3 %4 %5
exit 0

Settings for visual studio tfs:
  • For Extension, type *
  • For Operation, select Merge
  • For Command, browse for C:\Program Files\WinMerge\winmergeFromTFS.bat
  • For Arguments, type %6 %7 %1 %2 %4
Upd: fixed path to winmerge on my system.