Veracity Q&A home login about faq
3
2

I want to use Beyond Compare 3 for file diffs in Veracity, so I tried using vv diff --tool ARG:

$ vv diff --tool "C:\Program Files\Beyond Compare 3\BComp.exe"
=== ================
===   Modified: File @/README.txt
vv.exe: Error 2 (sglib): Invalid argument: Unknown difftool 'C:\Program Files\Beyond Compare 3\BComp.exe'.
    c:\work\s\sprawl\public\src\libraries\ut\sg_difftool.c:357
    c:\work\s\sprawl\public\src\libraries\ut\sg_difftool.c:470
    c:\work\s\sprawl\public\src\libraries\ut\sg_treediff2.c:4626
    c:\work\s\sprawl\public\src\libraries\ut\sg_treediff2.c:5034
    c:\work\s\sprawl\public\src\libraries\ut\sg_treediff2.c:2610
    c:\work\s\sprawl\public\src\libraries\ut\sg_treediff2.c:5120
    c:\work\s\sprawl\public\src\cmd\sg.c:6270
    c:\work\s\sprawl\public\src\cmd\sg.c:8191
    c:\work\s\sprawl\public\src\cmd\sg.c:9383
    c:\work\s\sprawl\public\src\cmd\sg.c:9638

What do I need to do to make this work? Can I permanently assign a custom diff tool?

asked Nov 16 '11 at 10:16

Jace%20Browning's gravatar image

Jace Browning
1.8k556982

edited Jun 30 '12 at 12:09


To use Veracity with a custom diff (or merge) tool, you must first configure the tool in your settings. Then you can specify the tool by its configured name using --tool, and/or you can set it as the default tool to use in specified circumstances. An upcoming release will have built-in configuration settings for many common diff and merge tools, including Beyond Compare 3, but for now you'll have to do the configuration manually.

Here are the commands you'll need to run to configure Beyond Compare 3:

vv config reset filetools/diff/bcompare
vv config set filetools/diff/bcompare/path "C:\Program Files\Beyond Compare 3\BComp.exe"
vv config add-to filetools/diff/bcompare/args /solo /lefttitle=@FROM_LABEL@ /righttitle=@TO_LABEL@ @FROM@ @TO@

It should be reasonably obvious how you can adjust that for other diff tools, or for anyone reading this that has it installed at a different location, or so forth. The bcompare part of those commands is the arbitrary name that you'll use to specify the tool elsewhere, such as from the --tool flag. For example:

vv diff FILENAME --tool bcompare

To set this as your default tool, use the following:

vv config set filetoolbindings/diff/:text bcompare

This sets bcompare as the default diff tool for the class of files called :text, which is generally what you want. This also leaves open the possibility of setting up other diff tools to be your default for other classes of files. The other built-in file class is :binary, but you can also configure your own.

To reset the default diff tool to the factory setting, use this command:

vv config reset filetoolbindings/diff/:text

Configuring and using a merge tool is similar. Here are the merge settings for Beyond Compare 3:

vv config reset filetools/merge/bcompare
vv config set filetools/merge/bcompare/path "C:\Program Files\Beyond Compare 3\BComp.exe"
vv config add-to filetools/merge/bcompare/args /solo /readonly /lefttitle=@BASELINE_LABEL@ /righttitle=@OTHER_LABEL@ /centertitle=@ANCESTOR_LABEL@ /outputtitle=@RESULT_LABEL@ @BASELINE@ @OTHER@ @ANCESTOR@ @RESULT@

Note that it's perfectly acceptable to have a diff tool and a merge tool with the same name (both bcompare in this case). Now you can use this tool during a resolve like so:

vv resolve merge FILENAME --tool bcompare

and you can set it as your default merge tool for resolve situations like so:

vv config set filetoolbindings/merge/:text/resolve bcompare
link

answered Nov 17 '11 at 10:31

Andy%20Tidball's gravatar image

Andy Tidball ♦
1.4k1930

Your answer
toggle preview

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here

By RSS:

Answers

Answers and Comments

Markdown Basics

  • *italic* or __italic__
  • **bold** or __bold__
  • link:[text](http://url.com/ "title")
  • image?![alt text](/path/img.jpg "title")
  • numbered list: 1. Foo 2. Bar
  • to add a line break simply add two spaces to where you would like the new line to be.
  • basic HTML tags are also supported

Tags:

×17
×9
×8

Asked: Nov 16 '11 at 10:16

Seen: 1,151 times

Last updated: Jun 30 '12 at 12:09

powered by OSQA