Share, Vote, & Discuss Ideas

We're constantly looking for new ways to improve our products and are asking you to help us by sharing your own ideas, voting for ideas you like, and discussing them with the rest of the community.

Diff binary files

It would be great to be able to diff files marked as binary in a depot that will end up in swarm reviews, particularly things like shell scripts which have to be marked as binary/executable in a depot to run properly. Currently swarm will show nothing except "Xbinary file edited" At a basic level, I'd expect it to be a context option to try a text diff of a binary file. Future features/stretch goals would be to provide diffing of other diffable binary types, like images, similar to Code Collaborator's feature set.
  • Guest
  • May 29 2015
  • Attach files
  • Jeff Anton commented
    July 27, 2015 17:55

    We have text+x for shell scripts.  No job is filed to say that does not work.  So, prove it!

  • Guest commented
    August 28, 2015 20:50

    We use binary/executable so line endings don't get converted and make the script unusable on different platforms (windows/linux/osx)

  • Josh Widen commented
    November 10, 2015 17:45

    We have Qt Designer XML files (.ui) checked in as binary files because they don't generally merge well and we don't want developers to use auto-resolve on them (just because there are no conflicts doesn't mean that it merged correctly).  P4V and P4Merge allow for merging of binary files (you have to enable an option in P4V) - why does this not exist in Swarm?

  • Dale du Preez commented
    April 05, 2016 20:58

    I am running into a similar situation where I have some shell scripts marked as binary+Dx to allow them to be handled in a Windows build environment without losing line endings. In this case, the D flag indicates that I want this file to be diffed, so not being able to do that from within Swarm is annoying. Can the Swarm logic be driven by the D flag in addition to the actual file type?