diffmerge repository path?

[nziese]

When I try to use diffmerge with the following paths
left file
$/TestDummyBranches/TestDummySolution/TestDummySolution/Form1.vb
right file
C:\Projects\TestDummyBranches\TestDummySolution\TestDummySolution\Form1.vb

I get and error:
The file in theleft panel: c:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\$/TestDummyBranches/TestDummySolution/TestDummySolution/Form1.vb
could not be imported. It goes on to say error 3: the sytem cannot find the path specified.

I can use this path ($/TestDummyBranches/TestDummySolution/TestDummySolution/Form1.vb) to show differences with no problem.
How do I change this defaut and what is the path to a file in the repository?

[lbauer]

What kind of diff are you doing -- are you comparing the file in your working directory with a file in the repository?

Are you diffing from within a Vault Client?

Could you send me a screenshot of your Show Differences selection? To do this:

In the Vault file list, right click on the file you want to diff and select Show Differences. I'd like to see what radio buttons are selected in the Show Differences window.

[nziese]

I am working with the Vault Client and want to merge a working file with the repository file. I have attached the Show Differences dialog.

showDiff.gif (12.54 KiB) Viewed 4863 times

Since I am not able to merge from Show Differences I open DiffMerge from the File menu. I have attached a screen shot of the file choices.

DiffMergeFilePaths.gif (11.18 KiB) Viewed 4863 times

The error I get

ErrorMsg.gif (15.26 KiB) Viewed 4863 times

[lbauer]

Now I understand what you're doing.

When you're using the Diff tool within Vault to compare a file in the repository with a file on disk, the Vault Client downloads a copy of the repository file to a temp directory. So DiffMerge is actually comparing two files on disk.

When you use DiffMerge as a standalone, it also compares two files on disk.

Putting a repository path like "$/TestDummyBranches/TestDummySolution/TestDummySolution/Form1.vb" in the diff tool doesn't work, because the Diff tool by itself can't access the repository.

I'd suggest doing a GET on the repository file to a non-working directory, then using DiffMerge to compare it to your local file. To do a GET to a non-working folder, just change the path in the GET Latest Version dialog box.

[nziese]

Thank you.

[lbauer]

You're welcome.