Jump to content
msloan7

Unable to diff shelved files in P4v

Recommended Posts

After following the instructions to configure semantic merge as the difftool, I get an error of that looks like the following when right-clicking a shelved files and clicking "Diff against source revision":

 

Could not find file

'{path}\SomeCSharpFile@'

 

Looking at the log in Perforce I see the following command:

p4 diff2 {path}/SomeCSharpFile.cs#65 {path}/SomeCSharpFile.cs@=418368

 

It appears that SemanticMerge is not handling the @=4183868 revision symbol at the end of the second file.

 

Diffing unshelved files works fine for me.

  • Like 4

Share this post


Link to post
Share on other sites

Hi,

 

I'm not able to get the problem reproduced :(

 

When I invoke semanticmerge with the following line, it works fine!

semanticmergetool.exe -s=C:\example\CSharp\SomeCSharpFile.cs#65 -d=C:\example\CSharp\SomeCSharpFile.cs@=418368 -l=csharp

fuhz.png

 

Could you send me the semanticmerge log when you perform the p4 command?

 

The file to configure the log is named semantic.log.conf and you can find it under the installation directory: "C:\Users\<youruser>\AppData\Local\PlasticSCM4\semanticmerge". It should be set to the DEBUG level.

 

Thanks in advance.

Míryam

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×
×
  • Create New...