External diff tool

[Guillaume M]

Hello,

I'm trying to use an external diff tool.
I've added an entry into the Diff tools option, use this tool for text
files, and move the rule to the top so it has highest priority.

However, when I try to perform a diff in Plastic, i get this error:
Error in diff tool "C:\Program Files (x86)\Beyond Compare
3\BCompare.exe "@sourcefile" "@destinationfile"" execution. Diff tools
in client.conf are incorrectly defined.

The command is working fine if I call it from outside Plastic ie:
Windows->Run (substituing Plastic params by real file name).

I tried, with no success:
C:\Program Files (x86)\Beyond Compare 3\BCompare.exe "@sourcefile"
"@destinationfile"
"C:\Program Files (x86)\Beyond Compare 3\BCompare.exe" "@sourcefile"
"@destinationfile"
C:\Program Files (x86)\Beyond Compare 3\BCompare.exe
"C:\Program Files (x86)\Beyond Compare 3\BCompare.exe"

Can you help me find the problem ?

Here is my client.conf file:
<?xml version="1.0"?>
<ClientConfigData xmlns:xsi="http://www.w3.org/2001/XMLSchema-
instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Language>en</Language>
<WorkspaceServer>server:8084</WorkspaceServer>
<WorkingMode>UPWorkingMode</WorkingMode>
<SecurityConfig>guilmori:kuzcNpGBKnf76Li/d3jleMkxzqZHzvS/</
SecurityConfig>
<CurrentWorkspace>c:\plastic\man.dev.work</CurrentWorkspace>
<MergeTools>
<MergeToolData>
<FileType>enTextFile</FileType>
<FileExtensions>*</FileExtensions>
<Tools>
<string>mergetool -b="@basefile" -bn="@basesymbolic" -
bh="@basehash" -s="@sourcefile" -sn="@sourcesymbolic" -
sh="@sourcehash" -d="@destinationfile" -dh="@destinationhash" -a -
r="@output" -t="@filetype" -i="@comparationmethod" -e="@fileencoding" -
m="@mergetype"</string>
</Tools>
</MergeToolData>
<MergeToolData>
<FileType>enBinaryFile</FileType>
<FileExtensions>*</FileExtensions>
<Tools>
<string>binmergetool -b="@basefile" -bn="@basesymbolic" -
bh="@basehash" -s="@sourcefile" -sn="@sourcesymbolic" -
sh="@sourcehash" -d="@destinationfile" -dh="@destinationhash" -a -
r="@output" -m="@mergetype"</string>
</Tools>
</MergeToolData>
</MergeTools>
<DiffTools>
<DiffToolData>
<FileType>enTextFile</FileType>
<FileExtensions>*</FileExtensions>
<Tools>
<string>C:\Program Files (x86)\Beyond Compare 3\BCompare.exe
"@sourcefile" "@destinationfile"</string>
</Tools>
</DiffToolData>
<DiffToolData>
<FileType>enTextFile</FileType>
<FileExtensions>*</FileExtensions>
<Tools>
<string>mergetool -s="@sourcefile" -sn="@sourcesymbolic" -
d="@destinationfile" -dn="@destinationsymbolic" -a -t="@filetype" -
i="@comparationmethod" -e="@fileencoding"</string>
</Tools>
</DiffToolData>
<DiffToolData>
<FileType>enBinaryFile</FileType>
<FileExtensions>*</FileExtensions>
<Tools>
<string>binmergetool -s="@sourcefile" -sn="@sourcesymbolic" -
d="@destinationfile" -dn="@destinationsymbolic" -a -t="@filetype" -
i="@comparationmethod" -e="@fileencoding"</string>
</Tools>
</DiffToolData>
</DiffTools>
<SetFilesAsReadOnly>no</SetFilesAsReadOnly>
<SetRevisionFileDate>no</SetRevisionFileDate>
<CheckFileContentForChanged>no</CheckFileContentForChanged>
<CaseSensitiveFsOnMac>no</CaseSensitiveFsOnMac>
<CacheServer />
<CheckinQueuesSize>50</CheckinQueuesSize>
</ClientConfigData>

[psan...@codicesoftware.com]

Hi,

It's a bug. The problem is the space in the path of the external tool.
Add it to the PATH and it will work.

This bug was already reported so we'll have to fix it asap, expect it
quite soon.

Now, one comment: do you miss BC or simply are not yet used to our diff
and merge tool???

Remember BC can't do some of the things xmerge can... :P

http://www.scootersoftware.com/vbulletin/showthread.php?t=6076

Cheers,

pablo

[Guillaume M]

Well I was just trying to be sure the integration with BC is working,
since many people here use BC.

I must say that I miss BC bottom status bar which displays the current
left and right lines on top of each others.
I find it more easy to see the differences between the 2 lines,
especially for long line.

However, the feature you mention seems great, so I may keep with your
diff tool for some time :-)

On Nov 18, 2:54 pm, "psant...@codicesoftware.com"

[psan...@codicesoftware.com]

> However, the feature you mention
> seems great, so I may keep with your
> diff tool for some time :-)

And it also works during merging... have you seen this?? :)

I'll take note of your suggestions for the merge tool.

We're working on language support for merge, it will be simply huge!

:P

[Guillaume M]

On Nov 18, 3:27 pm, "psant...@codicesoftware.com"

<psant...@codicesoftware.com> wrote:
> And it also works during merging... have you seen this?? :)

Oh wow, no I had not seen this.
You have to make the xmerge button more visible !! :-)