Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-5888

External diff broken in sourcetree 2.7.6-177

    XMLWordPrintable

Details

    • Bug
    • Status: Closed (View Workflow)
    • Low
    • Resolution: Incomplete
    • 2.7.6
    • None
    • General
    • None
    • MacBook Pro, macOS 10.13.5

      Mercurial 4.3.3 (with local + remote repos)

      external diff tool: Beyond Compare 4.2.4

      java version 1.8.0_144

    • Severity 3 - Minor

    Description

      External diff seems broken in sourcetree 2.7.6-177 (Mac): when I try to external-diff nothing seems to happen, and I have had the same issue with 2.7.5.

      If - on the other hand - I replace 2.7.6-177 with 2.7.3-169 then it works; to me this indicates it is something with the 2.7.5 and 2.7.6 releases rather than my configuration.

       

      To replicate, simply modify a version-controlled file, and open its repo in SourceTree: SourceTree will show the modification in its diff-pane, and yet r-clicking the file and selecting 'External Diff' does nothing; i.e. no error-message is shown, nor does the external-diff tool get launched/opened.

       

      My configuration:

      SourceTree pref -> Diff: External-Diff/Merge setup as follows:

      Visual Diff Tool: Custom

      Diff Command: /usr/local/bin/bcomp

      Diff Command Arguments: $LOCAL $REMOTE

      Merge Tool: custom

      Merge Command: /usr/local/bin/bcomp

      Merge Command Arguments: $LOCAL $REMOTE $BASE $MERGED

      Attachments

        Activity

          People

            Unassigned Unassigned
            b67c351a1631 R C
            Votes:
            4 Vote for this issue
            Watchers:
            9 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: