I’ve been making good progress on Changes.app. I’m finishing up the directory comparison view and moving on to the line-by-line comparison.

Originally, I thought I’d make the line-by-line file comparison work like the one in FileMerge.app.

filemerge-line-by-line.png

However, I liked the way that Beyond Compare 2 allows the user’s eyes to track horizontally across the window to the matched lines, using blank lines to space and align the text.

bc2-line-by-line.png

I’ve settled on an approach which tracks more closely to the Beyond Compare 2 solution, while preserving the polish of FileMerge.app.

Explore posts in the same categories: Cocoa, OS X

2 Comments on “Changes.app Progess”

  1. Sengan Says:

    Please make it work from the command line. On Linux I used python to check out an older version of my source code to a temporary directory, and then tcldiff to let me compare old versions of code in the repository with the latest version. In the same way it would be nice to do the same on a mac, but IRC FileMerge doesn’t work with the command line.

  2. ibaird Says:

    Try using opendiff to run FileMerge from the command line. “man opendiff” for more details.

Comment: