However, I did find that VSS 2005 is backward compatible with VSS 6.0 databases. I copied the settings from this post: Īs I stated previously, I don't think we can integrate WinMerge with Visual Studio 2008 and VSS 6.0. I'm using VS2008, sourcesafe 2005, and winmerge 2.12.4 installed to the default directory. #Winmerge 2.12.4 setup update#I'll update this post if I ever have more info to add. I haven't gotten to the situation where I'm in an actual "merge" situation so I'm not sure what happens there. visual studio will just recognize the file has changed and ask you to reload. if you selected a highlighted difference, you can actually sync that area at this time as well. the original is on the left and the modified file is on the right (is that the right placement? should they be swapped?). Using "compare" from a file's context menu or viewing history and selecting "diff" should bring up winmerge with the file comparison. In the sourcesafe options dialog, switch to the "custom editors" tabįor command line enter "C:\Program Files\WinMerge\WinMergeU.exe" /x /e /ub /wl /dl %6 /dr %7 %1 %2Ĭlick the "add" button then the "ok" button. In visual studio go to tools > options > source control > plug-in settings I think I have this working at a serviceable level if not optimal. #Winmerge 2.12.4 setup how to#It says how to do it about 1/5th the way down the page. winmerge project file format resulting in a crash overflowing the memory stack. Desc: WinMerge version 2.12.4 suffers from a stack overflow vulnerability because it fails to properly sanitize user supplied input when parsing. You mentioned VSS: Check out the Winmerge manual here. WinMerge can be used as an external differencing/merging tool or as a standalone application. This site: has the settings for many, including winmerge: In the tree, choose Source Control, then the plugin of your choice (VS team Foundation, Source Safe, etc).Ĭlick the "Configure User Tools" button, click add, then specify the appropriate extension, operation, EXE, and arguments list. I have been wondering about this as well and have not found anything to make it possible in VSS 6.0.įor now, it looks like the answer to our question is "No". I'm not interested in going to the folder explorer and doing the comparison there. Is this possible? I'm looking for a quick replacement of the current bland diff tool an I just like WinMerge better. I would like to use WinMerge as the default diff tool inside VS2008 from the solutions explorer in place of the "Compare." context menu item.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |