Diff

To view the difference between the select working copy file and a revision,in the repository, or between any of two revisions use the Diff option ( Query->Diff (F9) ). The Diff option also enables difference checking between files resiting in the repository. The Diff dialog provides the following options:

Figure 3.2. Diff

Diff
Revision

Select the radio button and enter a value equal to a revision number. Use the R to display the Log information and select a revision number or use KEYWORDS:

HEAD

The latest revision in the repository.

BASE

The "pristine" revision of an item in a working copy.

COMMITTED

The last revision in which an item changed before (or at) BASE.

PREV

The revision just before the last revision in which an item changed. (Technically, COMMITTED - 1.)

Use the H, P, or B button to specify the HEAD, PREV or BASE keywords respectively.

Date

Select the radio button and enter a value equal to a revision date or time. Specify date or time using any of the following syntax:

  • 2004-02-17

  • 15:30

  • 15:30:00.200000

  • 2004-02-17 15:30

  • 2004-02-17 15:30 +0230

  • 2004-02-17T15:30

  • 2004-02-17T15:30Z

  • 2004-02-17T15:30-04:00

  • 20040217T1530

  • 20040217T1530Z

  • 20040217T1530-0500

External diff

Uses the diff application specified in the Diff field of the Options dialog (see the section called “Configuring Options”). The diff application has to support executing with two file names in the command line

Non-recursive

When performing diff operation on a folder the operation is only performed on the selected folder and not an y sub folders.

Notice ancestry

???

Extension

String of parameters what will be sent as-is to the diff application

URL/File 1

The path to the first folder or file located in the repository. Use the U button to display the URL Wizard which can be used to specify the path.

URL/File 2

The path to the second folder or file located in the repository. Use the U button to display the URL Wizard which can be used to specify the path.