{"id":344,"date":"2008-10-08T19:20:26","date_gmt":"2008-10-08T17:20:26","guid":{"rendered":"http:\/\/blog.m-ri.de\/?p=344"},"modified":"2008-10-08T19:15:38","modified_gmt":"2008-10-08T17:15:38","slug":"vs-tipps-tricks-winmerge-als-diff-tool-in-verbindung-mit-tfs","status":"publish","type":"post","link":"http:\/\/blog.m-ri.de\/index.php\/2008\/10\/08\/vs-tipps-tricks-winmerge-als-diff-tool-in-verbindung-mit-tfs\/","title":{"rendered":"VS Tipps &#038; Tricks: WinMerge als DIFF-Tool in Verbindung mit TFS"},"content":{"rendered":"<p>Ich bin ein wirklicher Fan von <a href=\"http:\/\/winmerge.sourceforge.net\/\">WinMerge<\/a> und deshalb nutze ich es auch als Ersatz f\u00fcr das Standard TFS Tool DiffMerge.exe. Wer noch nicht wusste, dass man hier ein eigenes Tool im <em>TFS <\/em>f\u00fcr <em>Compare <\/em>und <em>Merge <\/em>w\u00e4hlen kann, der findet die entsprechenden Einstellungen unter: <em>Tools -&gt; Options -&gt; Source Control -&gt; Visual Studio Team Foundation Server -&gt; Configure User Tools<\/em><\/p>\n<p>Um <em>WinMerge <\/em>f\u00fcr den <em><strong>Compare <\/strong><\/em>einzusetzen verwende ich die folgenden Parameter:<\/p>\n<blockquote><p>Program: <strong>C:\\Programme\\WinMerge\\WinMergeU.exe<\/strong><br \/>\nArguments: <strong>\/x \/e \/wl \/ub \/dl %6 \/dr %7 %1 %2<\/strong><\/p><\/blockquote>\n<p>Und folgende Parameter habe ich f\u00fcr den <strong><em>Merge <\/em><\/strong>eingestellt:<\/p>\n<blockquote><p>Program: <strong>C:\\Programme\\WinMerge\\WinMergeU.exe<\/strong><br \/>\nArguments: <strong>\/x \/e \/wl \/ub \/dl %6 \/dr %7 %1 %2 %4<\/strong><\/p><\/blockquote>\n<p>Hier eine Erkl\u00e4rung aus der Onlinehilfe von <em>WinMerge <\/em>f\u00fcr Befehlszeilenschalter, die ich aktuell verwende:<\/p>\n<ul>\n<li>\/x closes WinMerge if opened files are identical (after information dialog is shown). This parameter is useful when WinMerge is used as an external compare application. It helps to faster process and\/or ignore files which don&#8217;t have any differences. Note that this option does not apply when files become identical when merging\/editing them.<\/li>\n<li>\/e allows WinMerge to be closed with a single <span>Esc<\/span> keypress. This is useful when using WinMerge as an external compare application. WinMerge can act like an dialog which is easy and fast to close.<\/li>\n<li>\/wl initially opens left side as read-only. Use this when you don&#8217;t want to change left-side items in compare.<\/li>\n<li>\/ub tells WinMerge to not add both paths to MRU. External applications should not add paths to Open-dialog&#8217;s MRU lists.<\/li>\n<li>\/dl adds a description for left side shown instead of folder \/ filename. This allows showing version number or label for compared items. Like &#8222;Version 1.0&#8220; or &#8222;Work Copy&#8220;.<\/li>\n<li>\/dr adds a description for right side shown instead of folder \/ filename. This allows showing version number or label for compared items. Like &#8222;Version 1.0&#8220; or &#8222;Work Copy&#8220;.<\/li>\n<\/ul>\n<p>Die entsprechenden % Platzhalter sind so durch <em>Visual Studio <\/em>vorbelegt:<\/p>\n<ul>\n<li>%1 = Original file<\/li>\n<li>%2 = Modified file<\/li>\n<li>%3 = Base file<\/li>\n<li>%4 = Merged file<\/li>\n<li>%5 = Diff options<\/li>\n<li>%6 = Original file label (label for %1 file)<\/li>\n<li>%7 = Modified file label (label for %2 file)<\/li>\n<li>%8 = Base file label (label for %3 file)<\/li>\n<li>%9 = Merged file label (label for %4 file)<\/li>\n<\/ul>\n<p>Leider muss man f\u00fcr jeden Datentyp sowohl Compare als auch Merge einzeln einstellen. Eine Default-Einstellung habe ich nicht gefunden.<\/p>\n<p>Es gibt einen sch\u00f6nen Blogeintrag von James Manning, der auch noch andere Diff-Tools behandelt:<br \/>\n<a href=\"http:\/\/blogs.msdn.com\/jmanning\/articles\/535573.aspx\">http:\/\/blogs.msdn.com\/jmanning\/articles\/535573.aspx<\/a><br \/>\nWie man sieht habe ich die WinMerge Parameter jedoch angepasst.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Ich bin ein wirklicher Fan von WinMerge und deshalb nutze ich es auch als Ersatz f\u00fcr das Standard TFS Tool DiffMerge.exe. Wer noch nicht wusste, dass man hier ein eigenes Tool im TFS f\u00fcr Compare und Merge w\u00e4hlen kann, der findet die entsprechenden Einstellungen unter: Tools -&gt; Options -&gt; Source Control -&gt; Visual Studio Team &hellip; <a href=\"http:\/\/blog.m-ri.de\/index.php\/2008\/10\/08\/vs-tipps-tricks-winmerge-als-diff-tool-in-verbindung-mit-tfs\/\" class=\"more-link\"><span class=\"screen-reader-text\">\u201eVS Tipps &#038; Tricks: WinMerge als DIFF-Tool in Verbindung mit TFS\u201c <\/span>weiterlesen<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[20,3,29,32,27,31],"tags":[361,372,374],"class_list":["post-344","post","type-post","status-publish","format-standard","hentry","category-ide","category-programmieren","category-source-control","category-tfs","category-vs2008","category-vs-tipps-tricks","tag-ide","tag-tfs","tag-tools"],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/posts\/344","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/comments?post=344"}],"version-history":[{"count":1,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/posts\/344\/revisions"}],"predecessor-version":[{"id":345,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/posts\/344\/revisions\/345"}],"wp:attachment":[{"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/media?parent=344"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/categories?post=344"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.m-ri.de\/index.php\/wp-json\/wp\/v2\/tags?post=344"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}