![]() This is using the symlink of xcompare to point to bcompare. ![]() The symptom is that if I hit the delta (triangle) symbol on a version tree, it successfully pulls up a BC3 window comparing the two versions. I'm having the exact same problem, except in Linux and in CLearcase (with the psuedo-MVFS that ClearCase uses on the Linux side). I'm using Visual Studio 9.1 SP, Beyond Compare 3.1.10 (build 11626), WinXP installed in German. ![]() I've done a bit of Googling and found old posts about the funky version filenames TFS uses but nothing that matches this problem. I would, as would be usual, suspect a TFS bug but the fact it works fine when no other Beyond Compare is running makes me suspicious that it's a funny interaction with the two programs. Beyond Compare opens but the right window is empty with the error: "Cannot open file C:\Dokumente und Einstellungen\helles.angel\Lokale Einstellungen\Temp\TFSTemp\Log T.cpp The system cannot find the specified file". After an appropriate wait the Folder Differences appear, double click a difference to open the comparison window.ĥ. In Visual Studio Source Control Exploder right click on a file or directory that has been downloaded to the local disk and has changes. Right click on any other file: Compare to previous file.ģ. Right click on any file: Select Left side for compare.Ģ. For some reason TFS cannot create the temporary file it needs for the server file version.ġ. ![]() However if I have a second copy of Beyond Compare running, even if this is nothing to do with any TFS action, then the comparison fails. I have Beyond Compare integrated as my compare tool for all TFS actions and generally it works well. To fix this, you can add the argument /solo to the end of the arguments this ensures each comparison opens in a new window, working around the issue with tabs.Microsoft TFS is driving me a bit nuts, as usual. If you run Beyond Compare in tabbed mode, it can get confused when you diff or merge more than one set of files at a time from Visual Studio. If using Beyond Compare v3/v4 Standard or Beyond Compare v2 (2-way Merge): If using Beyond Compare Professional (3-way Merge): Command: C:\Program Files\Beyond Compare 3\BComp.exe (replace with the proper path for your machine, including version number).In Visual Studio, go to the Tools menu, select Options, expand Source Control, (In a TFS environment, click Visual Studio Team Foundation Server), and click on the Configure User Tools button.Įnter/select the following options for Compare: If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge. Then, I use $ git difftool to compare and $ git mergetool to merge.įor a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. #use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows softwareĬmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$(cygpath -w $LOCAL)" "$REMOTE"Ĭmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" My environment is Windows XP, git 1.7.1 on cygwin, and Beyond Compare 3.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |