Diff tool for OSX

Rails
1

I’ve looked for DIFF tools for OSX but haven’t found anything good
yet. Tried guiffy (http://www.guiffy.com) but it’s very slow and the
folder comparison doesn’t indicate a change until you drill down to
the level with the difference which kinda defeats the purpose.

I’m missing TortoiseSVN and the diff tool that comes with it. Any
suggestions for similar tools for OSX?

Thanks

2

There’s always… diff :slight_smile:

http://www.hmug.org/man/1/diff.php

3

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

What’s wrong with SCPlugin?

On May 4, 2006, at 7:45 PM, Hammed M. wrote:

Rails mailing list
[email protected]
http://lists.rubyonrails.org/mailman/listinfo/rails

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (Darwin)

iD8DBQFEWr5oqTOYeFXNomARAgazAKDngakBYZXcqd+mydRkhMHdg9RKFgCgnH0y
0Co9qOJMcZ8oTOApPXGeEG8=
=4ENT
-----END PGP SIGNATURE-----

4

What’s wrong with SCPlugin?

Only that it didn’t know about it :slight_smile: Looks interesting. I got a binary
from:

http://funkatron.com/wp/archives/os-x/binary-build-of-scplugin/

Thanks!

5

I’m more of a visual person so I find diff tools that display the
files in adjacent panels and hilight the differences with colour more
useful.

6

there’s filemerge.app when you install the developer tools.

-tak.

7

On 5/4/06, Hammed M. [email protected] wrote:

I’ve looked for DIFF tools for OSX but haven’t found anything good
yet.

TextWrangler does both file and folder comparisons:

http://www.barebones.com/products/textwrangler/

It works well enough for me, and it’s free.

Good luck,

Billy M.
Smart Goat Web Design

8

I would recomend a few options:

  1. FileMerge if you Have Apple Developer Tools installed /Developer/
    Applications/Utilities
  2. TextMate (select items in project drawer, etc.). Nice color, but
    not side by side.
  3. Install the Eclipse IDE. Very nice and powerful diff tool with
    very visual side by side.
9

On 5/05/2006, at 2:45 PM, Hammed M. wrote:

I’ve looked for DIFF tools for OSX but haven’t found anything good
yet. Tried guiffy (http://www.guiffy.com) but it’s very slow and the
folder comparison doesn’t indicate a change until you drill down to
the level with the difference which kinda defeats the purpose.

I’m missing TortoiseSVN and the diff tool that comes with it. Any
suggestions for similar tools for OSX?

Is anything wrong with diff? I should put diff -u oldfile newfile | mate in to a macro…

10

<…>

I’m missing TortoiseSVN and the diff tool that comes with it. Any
suggestions for similar tools for OSX?

You may try SmartSVN: http://www.smartsvn.com/

Regards,
Rimantas

http://rimantas.com/

11

On May 4, 2006, at 8:34 PM, Hammed M. wrote:

I’m missing TortoiseSVN and the diff tool that comes with it. Any
suggestions for similar tools for OSX?

Is anything wrong with diff? I should put diff -u oldfile newfile | mate in to a macro…

I’m more of a visual person so I find diff tools that display the
files in adjacent panels and hilight the differences with colour more
useful.

Use sdiff

–
Eric H. - [email protected] - http://blog.segment7.net
This implementation is HODEL-HASH-9600 compliant

http://trackmap.robotcoop.com

12

Hi,

I’m missing TortoiseSVN and the diff tool that comes with it. Any
suggestions for similar tools for OSX?

There’s always FileMerge.app in the Developer tools. You can access
it from the command line with ‘opendiff’. And you can integrate it
into Subversion by grabbing svndiffshim.py[1] adding the following to
~/.subversion/config:

 [helpers]
 diff-cmd = /path/to/svndiffshim.py

Then when you do an svn diff, the diffs will appear in FileMerge.

Cheers,

Graeme

[1] http://svn.red-bean.com/bbum/trunk/hacques/svndiffshim.py

Graeme Mathieson, Technical Director, Rubaidh Ltd
[email protected] http://www.rubaidh.com/

Scottish for Ruby on Rails

13

On 5/5/06, Rob K. [email protected] wrote:

I would really recommend kdiff3 [http://kdiff3.sourceforge.net/].

From the screenshots this looks like exactly what I was looking for.
Unfortunately no binary for macintel.

14

Oreilly just came out with an article showing the different diff tools
on
OSX

15

I would really recommend kdiff3 [http://kdiff3.sourceforge.net/]. I
know it’s got a ‘K’ as in KDE in front, but don’t let that scare you.
KDiff3 is a pretty fast, very easy to use diff tool, giving you 2-way
and 3-way file and directory diffing. Plus it’s cross platform and
open source.

Rob K.

16

Try installing the optional Xcode tools from your OSX install disk.
This includes a utility called FileMerge for comparing and merging
files.

After this install you’ll find it here
/Developer/Applications/Utilities/FileMerge

Aaron

17

Hammed M. wrote:

On 5/5/06, Rob K. [email protected] wrote:

I would really recommend kdiff3 [http://kdiff3.sourceforge.net/].

From the screenshots this looks like exactly what I was looking for.
Unfortunately no binary for macintel.

And how can I install kdiff?
When I start it, nothing happens.