Tools for Show Log\Edit Conflicts

PowerBuilder IDE provides no utilities to view logs or edit conflicts, but it allows you to specify the executable file of TortoiseSVN and use it to view logs and edit conflicts.

To specify the executable file of TortoiseSVN:

  1. Right-click the workspace/solution in the System Tree and select Properties from the pop-up menu.

  2. In the Properties of Workspace/Solution dialog box, select the Source Control tab, and then click the Advanced button.

  3. In the Source Control Advanced Settings dialog box, select Show Log/Edit Conflicts in the left panel, and then specify the executable program of TortoiseSVN.

  4. Click OK.

    Source Control Advanced Settings

To show the revision log:

  • Right-click the workspace/solution, target/project, library, or object in the System Tree and select SVN Show Log from the pop-up menu.

    The TortoiseSVN tool displays the revision logs directly.

To edit conflicts:

  • Right-click the object with the conflict sign () in the System Tree and select SVN Edit Conflicts from the pop-up menu.

    The TortoiseSVN tool displays the source control with the conflicts. For more details, see Resolve conflicts.