Forum: Ruby on Rails Diff tool for OSX

Announcement (2017-05-07): www.ruby-forum.com is now read-only since I unfortunately do not have the time to support and maintain the forum any more. Please see rubyonrails.org/community and ruby-lang.org/en/community for other Rails- und Ruby-related community platforms.
0bcc972918891ef358b0b3dfb4e7f18b?d=identicon&s=25 Hammed Malik (Guest)
on 2006-05-05 04:47
(Received via mailing list)
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
31ae911dd0fe0ee0b81519d6d2627886?d=identicon&s=25 Gravy Face (gravyface)
on 2006-05-05 04:53
(Received via mailing list)
There's always... diff :)

http://www.hmug.org/man/1/diff.php
465be8aab4ccfa0e89a9f657ccc60d63?d=identicon&s=25 Tres Wong-Godfrey (Guest)
on 2006-05-05 04:56
(Received via mailing list)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


What's wrong with SCPlugin?



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

> Rails mailing list
> Rails@lists.rubyonrails.org
> http://lists.rubyonrails.org/mailman/listinfo/rails

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

iD8DBQFEWr5oqTOYeFXNomARAgazAKDngakBYZXcqd+mydRkhMHdg9RKFgCgnH0y
0Co9qOJMcZ8oTOApPXGeEG8=
=4ENT
-----END PGP SIGNATURE-----
0bcc972918891ef358b0b3dfb4e7f18b?d=identicon&s=25 Hammed Malik (Guest)
on 2006-05-05 05:03
(Received via mailing list)
> What's wrong with SCPlugin?

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

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

Thanks!
B1102f65359ee629df508c7857f03b1c?d=identicon&s=25 Phillip Hutchings (Guest)
on 2006-05-05 05:09
(Received via mailing list)
On 5/05/2006, at 2:45 PM, Hammed Malik 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...
0bcc972918891ef358b0b3dfb4e7f18b?d=identicon&s=25 Hammed Malik (Guest)
on 2006-05-05 05:36
(Received via mailing list)
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.
5f684d0857aad571acf1aa1e1fb3e544?d=identicon&s=25 Takashi Okamoto (Guest)
on 2006-05-05 05:39
(Received via mailing list)
there's filemerge.app when you install the developer tools.

-tak.
F4da0be8aff190273289ad09bbbc4eda?d=identicon&s=25 Billy Mabray (Guest)
on 2006-05-05 06:15
(Received via mailing list)
On 5/4/06, Hammed Malik <hammed@gmail.com> 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 Mabray
Smart Goat Web Design
http://www.smartgoat.com
F0b14b7dbae1e90259eb946d1c841a17?d=identicon&s=25 Ken Collins (Guest)
on 2006-05-05 07:10
(Received via mailing list)
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.
Ec5a599777854c540fd102ef4691fe10?d=identicon&s=25 Rimantas Liubertas (Guest)
on 2006-05-05 11:32
(Received via mailing list)
<...>
> 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/
3d52a27007359841566a61e74054922b?d=identicon&s=25 Graeme Mathieson (Guest)
on 2006-05-05 11:54
(Received via mailing list)
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
mathie@rubaidh.com        http://www.rubaidh.com/

Scottish for Ruby on Rails
58479f76374a3ba3c69b9804163f39f4?d=identicon&s=25 Eric Hodel (Guest)
on 2006-05-05 19:42
(Received via mailing list)
On May 4, 2006, at 8:34 PM, Hammed Malik 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 Hodel - drbrain@segment7.net - http://blog.segment7.net
This implementation is HODEL-HASH-9600 compliant

http://trackmap.robotcoop.com
2a3be1d8227283eb4e1613ef631d78b8?d=identicon&s=25 Rob Kaufman (Guest)
on 2006-05-05 22:36
(Received via mailing list)
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 Kaufman
0bcc972918891ef358b0b3dfb4e7f18b?d=identicon&s=25 Hammed Malik (Guest)
on 2006-05-06 00:12
(Received via mailing list)
On 5/5/06, Rob Kaufman <rgkaufman@gmail.com> 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.
6ff7cc79a09836e7930763a9d8b6ba9a?d=identicon&s=25 Dominic Sisneros (Guest)
on 2006-05-06 01:31
(Received via mailing list)
Oreilly just came out with an article showing the different diff tools
on
OSX

http://www.oreillynet.com/pub/a/mac/2006/05/02/fil...
Fec8296216ec92d143dc4d8918f79bae?d=identicon&s=25 Remo (Guest)
on 2006-12-10 14:22
Hammed Malik wrote:
> On 5/5/06, Rob Kaufman <rgkaufman@gmail.com> 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.
8da92d4ed91aa12535f6d870fa76b25e?d=identicon&s=25 Aaron Baldwin (Guest)
on 2006-12-12 17:32
(Received via mailing list)
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
This topic is locked and can not be replied to.