Using Changes app

Friday, April 03, 2009 1 Comments

As most of us Mac developers will be aware, Xcode comes with FileMerge, but sometimes you just need a little bit extra. I recently came across Changes, here's how to use it with Plastic.

After downloading, install the Terminal Utility to give yourself the command line interface. Then, from within a workspace, you can diff two revisions like so (I'm using BASH):

$ chdiff <(cm cat GameScene.mm#br:/main#1) <(cm cat GameScene.mm#br:/main#LAST)

To get this working from within the Plastic GUI client, we'll need to edit the client.conf file which is located in ~/.plastic/client.conf.

Find the section <DiffTools>, and a few lines down replace the "mergetool" entry with this:

<string>/usr/bin/chdiff "@sourcefile" "@destinationfile"</string>
Restart the Plastic GUI client and diff away.






We develop Plastic SCM, a version control that excels in branching and merging, can deal with huge projects and big binary assets natively, and it comes with GUIs and tools to make everything simpler.

If you want to give it a try, download it from here.

We are also the developers of SemanticMerge, and the gmaster Git client.

1 comment: