At 12:38 PM -0800 2/17/05, Eric Hsu wrote:
At 7:46 PM +0100 2/17/05, Torsten Becker wrote:
you can select 2 files in the project drawer and after executing this command a colored diff should pop up.
I bet someone enterprising, and with more time than me could:
- ramp up Torsten's command to output hyperlinked diffs, so
clicking on the diff jumps to the appropriate document and line;
- (less obvious) use Applescript to move the two original windows
side by side and put the diff output in a lower window.
Okay, I wasted a lot of time today doing #1 above. It now shows the changes in color inline with the unchanged parts of the document. Clicking on a line takes you to the newer version (or if it's a deletion) to the older version.
I had wanted to add cool links (like in the Subversion Log command) to show/hide the common parts and also allow switching which document was considered the newer one. As it is now, whichever one appears first in the TM project drawer is the 'older' one.
It's a start. I think it can become cooler with time.
The Bundle is at http://macromates.com/svn/Bundles/trunk/Diff.tmbundle/
- Eric