(I read the manual, did a search of the archives for "diff FileMerge" and read all hits before writing this email, and I have also tried a couple of the Diff commands in the Subversion bundle.)
I am wondering if, either as part of Allan's documentation effort, or as some bundle maintainer's efforts, a simple "How to Find Differences Using TextMate" document could be written. Because I confess, I am at sea as to how to get a useful, usable diff of two similar documents.
My gold standard for usable differences is (as many of the list postings discussed) BBEdit. In particular, it has a menu command, "Compare Two Front Documents", which provides a highly usable interface to locate, review, and merge/modify the differences between two open documents. FileMerge, while flawed in some important ways, also provides a reasonably useful way of interacting with two files. (The diff output of the Subversion bundle is not suitable to my group's needs.)
For me, it's *critical* that a usable diff command *not* require either document to be under revision control. I am the first person in my group to be using any form of revision control more sophisticated than DreamWeaver's simple file locking. Subversion is being used only on new projects which I am in charge of, which is a very small percentage of the stuff I'm working on, so it'll be a good while before I can count on having stuff in Subversion.
Perhaps this suggestion will be taken as rude (and it won't be useful for non-BBEdit converts who don't have a BBEdit license), but it would be perfectly acceptable for a TextMate differences command to simply pass along the two file references to BBEdit's command line differences program, bbdiff, if the process would allow me to resolve my differences there and have the results saved back into my open documents in TextMate. A more universal version might use FileMerge instead of bbdiff.
Last, an offer: If there is an acceptable differences command already, and someone will write up a quick list of the steps to use it ala the "Compare Two Front Documents" command, I will write up a complete tutorial, complete with screenshots, etc., suitable for the complete newbie (such as myself, and my co-workers).
I'm a good technical writer, by way of credentials, here are some URLs to Mac OS X documentation I've written:
* PGP Desktop Manual Proxy Settings: http://aldoblog.com/blog/493
* Getting Started with m0n0wall: http://www.aldosoft.com/docs/m0n0wall-getting-started.html
* A whole series of articles covering audiobooks on iTunes and the iPod: http://aldoblog.com/audiobooks/
So, I'll commit to writing some quality docs for the wiki covering a differences command, if someone will point me in the direction of a differences command that is useful for my (and my co-workers') needs.
Thanks!
On Dec 20, 2005, at 1:16 AM, Michael A. Alderete wrote:
I am wondering if, either as part of Allan's documentation effort, or as some bundle maintainer's efforts, a simple "How to Find Differences Using TextMate" document could be written. Because I confess, I am at sea as to how to get a useful, usable diff of two similar documents.
[snip]
Hey Michael.
There's actually a Diff bundle ... definitely in the svn repositories (I'm guessing that its not in the default ones) ... go do an svn co of the Bundles (instructions on the wiki) and toss out the ones you don't need ... the diff commands in there should be pretty self explanatory. Last I remember, there wasn't something like "active" diffing .. something of a live update of the diff as maybe your changing (manually) one file against the other (after the initial diff, that is) ... I could be wrong since I haven't used it in some time.
Still, it can be helpful nonetheless.
My gold standard for usable differences is (as many of the list postings discussed) BBEdit. In particular, it has a menu command, "Compare Two Front Documents", which provides a highly usable interface to locate, review, and merge/modify the differences between two open documents. FileMerge, while flawed in some important ways, also provides a reasonably useful way of interacting with two files. (The diff output of the Subversion bundle is not suitable to my group's needs.)
I never have used BBEdit's diff command, but apple's FileMerge application (that comes with the developer tools) I remember hitting me as pretty sweet when I saw it ... maybe we could whip up a TextMate command and put it in the Diff bundle that shoots over 2 files for FileMerge to compare ... at least everyone has free access to that app... not that I have a problem w/ BBEdit .. I'm just saying.
Hope that helps, -steve
On 20/12/2005, at 7:16, Michael A. Alderete wrote:
(I read the manual, did a search of the archives for "diff FileMerge" and read all hits before writing this email, and I have also tried a couple of the Diff commands in the Subversion bundle.)
I added a small section about the Diff bundle that Steve mentioned (which is included as one of the default bundles): http:// macromates.com/textmate/manual/bundles.html#diff
There is a command to open FileMerge with the two files selected in the project drawer.
(I read the manual, did a search of the archives for "diff FileMerge" and read all hits before writing this email, and I have also tried a couple of the Diff commands in the Subversion bundle.)
I added a small section about the Diff bundle that Steve mentioned (which is included as one of the default bundles): http:// macromates.com/textmate/manual/bundles.html#diff
There is a command to open FileMerge with the two files selected in the project drawer.
<laughter /> Well I'll be damned. I spent 45 minutes reviewing the mailing list (search string: "diff FileMerge") and the new manual, and never saw a reference to the Diff bundle (which is indeed included in the defaults), just the Subversion diff commands. And so I completely missed the Diff bundle!
From the sound of it, this is exactly what I am looking for; I will give it
a go, and start documenting this evening.
Thanks!
Michael
-
Allan Odgaard -
Michael A. Alderete -
Steve Lianoglou