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
There''s always... diff :) http://www.hmug.org/man/1/diff.php 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. 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 > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails >
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 What''s wrong with SCPlugin? On May 4, 2006, at 7: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? > > Thanks > _______________________________________________ > 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-----
> 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-of-scplugin/ Thanks! On 5/4/06, Tres Wong-Godfrey <tres@blasp.hemo.us> wrote:> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > What''s wrong with SCPlugin? > > > > On May 4, 2006, at 7: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? > > > > Thanks > > _______________________________________________ > > 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----- > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails >
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... -- Phillip Hutchings phillip.hutchings@sitharus.com http://www.sitharus.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 2234 bytes Desc: not available Url : http://wrath.rubyonrails.org/pipermail/rails/attachments/20060505/64755f02/smime.bin
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. On 5/4/06, Phillip Hutchings <sitharus@sitharus.com> wrote:> > 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... > > -- > Phillip Hutchings > phillip.hutchings@sitharus.com > http://www.sitharus.com/ > > > > > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails > > > >
there''s filemerge.app when you install the developer tools. -tak. On May 4, 2006, at 10: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? > > Thanks > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails
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
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. On May 4, 2006, at 10: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? > > Thanks > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails-------------- next part -------------- An HTML attachment was scrubbed... URL: http://wrath.rubyonrails.org/pipermail/rails/attachments/20060505/614bc9b5/attachment.html
<...>> 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/
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
On May 4, 2006, at 8:34 PM, Hammed Malik wrote:> On 5/4/06, Phillip Hutchings <sitharus@sitharus.com> wrote: >> >> 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... > > 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
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 On 5/5/06, Eric Hodel <drbrain@segment7.net> wrote:> On May 4, 2006, at 8:34 PM, Hammed Malik wrote: > > > On 5/4/06, Phillip Hutchings <sitharus@sitharus.com> wrote: > >> > >> 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... > > > > 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 > > > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails >
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.
Oreilly just came out with an article showing the different diff tools on OSX http://www.oreillynet.com/pub/a/mac/2006/05/02/filemerge.html 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. 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 > _______________________________________________ > Rails mailing list > Rails@lists.rubyonrails.org > http://lists.rubyonrails.org/mailman/listinfo/rails >-------------- next part -------------- An HTML attachment was scrubbed... URL: http://wrath.rubyonrails.org/pipermail/rails/attachments/20060505/36a1a1c2/attachment.html
Hammed Malik wrote:> On 5/5/06, Rob Kaufman <rgkaufman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 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. -- Posted via http://www.ruby-forum.com/. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to rubyonrails-talk-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org To unsubscribe from this group, send email to rubyonrails-talk-unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---
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 On Dec 10, 2006, at 6:22 AM, Remo wrote:> > Hammed Malik wrote: >> On 5/5/06, Rob Kaufman <rgkaufman-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 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. > > -- > Posted via http://www.ruby-forum.com/. > > >--~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to rubyonrails-talk-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org To unsubscribe from this group, send email to rubyonrails-talk-unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---