try the filemerge bundle. it can automatically diff svn revisions in filemerge, which offers a very nice gui for diffing and conflict resolution.

hope that helps! -Nick

On Sat, Feb 28, 2009 at 2:13 AM, Scott Haneda talklists@newgeo.com wrote:

Hello all, every day I shave a few percentage points off the time I spend in BBedit, and get closer to 100% in TM.

Today, I am stuck on showing differences.  TM has a lot of good tools to show the differences in a standard `diff`y kind of way.

What I usually find useful, was in BBedit, I could compare the two most front files, a window would pop out below the files, sort of a left, right, and bottom frame display.  I could then move through the line differences in the files.

Any way to do this in TM?

Scott

• If you contact me off list replace talklists@ with scott@ *

---

textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate

On Mar 1, 2009, at 1:52 PM, Andrew Jaffe wrote:

On 28/2/09 22:06, Nick wrote:

...

try the filemerge bundle. it can automatically diff svn revisions in filemerge, which offers a very nice gui for diffing and conflict resolution.

Or "merge selected files" in the Diff bundle.

filemerge (aka opendiff) is a Mac GUI program which does what you want and is called by TM in these circumstances. (I still have a soft spot for the pure emacs version of parsing diff output, though!)

Thanks, I had no idea this app existed, is this in the Developer Tools, I can not locate the app itself? I also can see how to tell which direction to move the diffs in, but not how to save them. I must save a new file and replace over my old one? -- Scott

* If you contact me off list replace talklists@ with scott@ *

On Mar 2, 2009, at 2:59 PM, Morten Liebach wrote:

On Mar 2, 2009, at 23:32, Scott Haneda wrote:

...

On Mar 1, 2009, at 1:52 PM, Andrew Jaffe wrote:

...

On 28/2/09 22:06, Nick wrote:

...

try the filemerge bundle. it can automatically diff svn revisions in filemerge, which offers a very nice gui for diffing and conflict resolution.

Or "merge selected files" in the Diff bundle.

filemerge (aka opendiff) is a Mac GUI program which does what you want and is called by TM in these circumstances. (I still have a soft spot for the pure emacs version of parsing diff output, though!)

Thanks, I had no idea this app existed, is this in the Developer Tools, I can not locate the app itself?

Look in /Developer/Applications/Utilitie

Thanks. What are some other third party tools for this? BBedit is too heavy an app for me to want to keep aound for this one feature. The filemerge.app is buggy, and beachballs on me a lot, and can not seem to save the changes back to original files.

Somehow, I do a lot of comparing of files, I do have to say, BBedits implementation was pretty good. Looking for recommendations on something as good, standalone, with perhaps text-mate integration. -- Scott

* If you contact me off list replace talklists@ with scott@ *

On Mar 2, 2009, at 5:07 PM, Scott Haneda wrote:

Thanks. What are some other third party tools for this? BBedit is too heavy an app for me to want to keep aound for this one feature. The filemerge.app is buggy, and beachballs on me a lot, and can not seem to save the changes back to original files.

FWIW, I use FileMerge (2.4, 1080.0) a lot, and have never encountered any stability problems. I use it primarily with code and small data files (i.e., under 5-10 MB), so perhaps there are issues with larger files that I am unaware of. It might not be the most feature-rich application out there, but now that it handles differences within a single paragraph (i.e., without hard line breaks) quite well, it's adequate for most of my needs. The only thing I revert to -diff- for is generating patches.

-- Phil

On Mar 2, 2009, at 4:31 PM, Jude Robinson wrote:

...

Thanks. What are some other third party tools for this?

Hi Scott - there's a bit of discussion here that you might find of interest: http://blog.macromates.com/2008/changes-filemerge-replacement/

Yes, changes it is, very nice indeed, thank you for the link. -- Scott