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

Hang when trying to use external diff (FileMerge) to diff image file

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Low Low
    • None
    • 1.9.0
    • None
    • None

    • SourceTree 1.9.0 on OS X 10.9.2, FileMerge 2.8 (3005)

    • Severity 3 - Minor

      I tried diffing a .png file with external diff, which is FileMerge. FileMerge reported an error "not an ascii file". After that I returned to SourceTree and right clicked the same file (in commit changed files list) at which point SourceTree didn't respond. The situation was fixed when FileMerge was killed.

            [SRCTREE-2327] Hang when trying to use external diff (FileMerge) to diff image file

            Arati Mohanty added a comment -

            Issue fixed in 4.2.5. Kindly upgrade the Sourcetree Version and verify.

            Arati Mohanty added a comment - Issue fixed in 4.2.5. Kindly upgrade the Sourcetree Version and verify.

            Markus Hanauska added a comment -

            This is expected behavior. SourceTree must wait until FileMerge has excited as that is the only way for SourceTree to know that you are done merging. SourceTree won't notice when something went wrong and no merge takes place, SourceTree simply has to wait for FileMerge to exit. See SRCTREE-2674.

            Markus Hanauska added a comment - This is expected behavior. SourceTree must wait until FileMerge has excited as that is the only way for SourceTree to know that you are done merging. SourceTree won't notice when something went wrong and no merge takes place, SourceTree simply has to wait for FileMerge to exit. See SRCTREE-2674 .

              Unassigned Unassigned
              8e0b1c4f38bd Oiva Eskola
              Affected customers:
              1 This affects my team
              Watchers:
              4 Start watching this issue

                Created:
                Updated:
                Resolved: