Source-control setup
Tools ▸ Set up TortoiseGit and Tools ▸ Set up TortoiseSVN write the client's configuration for you, so that a comparison or a merge started in TortoiseGit or TortoiseSVN opens in pb-diff. They are for route 2 of From the PowerBuilder IDE: see what you changed, in which PowerBuilder delegates to Tortoise, and for comparisons started in Tortoise itself. They are not needed when PowerBuilder launches pb-diff directly, and they do not edit any PowerBuilder settings or INI files.
What the dialog shows
The dialog says whether the client is installed and where, then lists every setting it would write: one row per extension on Tortoise's Advanced Diff Viewer and Merge Tool pages, with the current command and the proposed one. It can register settings for a client that is not installed yet, but it does not install the client.
| Tool | Extensions | What opens |
|---|---|---|
| Diff | .sra .srd .srf .srm .srp .srj .srq .srs .sru .srw |
A File Compare, with header-based object detection. |
| Diff | .pbw .pbt .pbsln .pbproj .pbr .gen |
A File Compare of the build file: targets, libraries, projects, resources. |
| Diff | .pbl .pbd |
A Compare Summary of the two libraries, without the source-header rule. |
| Merge | .sra .srd .srf .srm .srp .srj .srq .srs .sru .srw |
A three-way merge, saving where the client asks. |
| Merge | .pbw .pbt .pbsln .pbproj .pbr .gen |
A three-way merge of the build file, saved in the encoding it was read in. |
Libraries have no merge entry, because pb-diff never writes a
PowerBuilder library. .gen is PowerGen's extension; if
another tool you use writes .gen files too, clear its two
rows. Each row starts selected or not according to what is there
now:
- Not set: the row is selected.
- Already pb-diff: no change is needed; the row is not selected.
- pb-diff, another installation: the row is selected, to update its path.
- Another tool: its command is shown and the row is not selected. Select it yourself if pb-diff should replace that viewer.
Apply, and Remove pb-diff
Apply writes only the selected rows, and records their previous values under your profile first; the dialog names the record. Remove pb-diff restores those values, or their absence, leaves alone any setting changed since, and reports what it did.
These are the current Windows account's Tortoise settings: another account must configure its own client, and the account that registers must be the one that compares. Uninstalling pb-diff does not remove them; use Remove pb-diff first if you want them restored. They affect Tortoise only, not PowerBuilder's Diff Viewer and not another Git GUI.
The commands the dialog writes are the ones Source-control clients gives for setting a client up by hand.