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

External Diff/Merge with custom tool fails due to relative filenames

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • Low
    • None
    • 4.1.5
    • Diff
    • None
    • Severity 2 - Major

    Description

      SourceTree 4.1.5 (241)

      MacOS 12,2

      Steps:

      • setup some custom Diff/Merge tool
      • try to either diff against changed file in working tree or resolve conflicts

      Expected:

      • it works

      Actual:

      • it doesn't due to bad filenames
      • to my view filename of what is in working tree seems relative to the repo

       

      Actually I tried to link SourceTree with Meld as I did couple years ago - that time they work together very good

      I used a way:

      • Diff command: `open`
      • Arguments: ` -W -a Meld --args "$LOCAL" "$REMOTE"`

       

      Using `ps` I captured

      I just captured `ps`  command line

      When it diffs some history revisions it puts full paths to the temporary files.

      However when it diffs some file in the working copy it uses path relative to the working copy root.

      Maybe I mad something wrong while setting up Diif/Merge commands?

      Attachments

        Activity

          People

            Unassigned Unassigned
            92d9aa7ec868 JK
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated: