Skip to content

{ Category Archives } FileMerge

Cha-cha-changes

Changes is out of beta with a 1.0 release. Changes allows you to compare diretories and files and is Leopard only taking advantage of Core Animation and Quick Look. Offering editor support for BBEdit, TextWrangler, TextMate, and Xcode and version control integration for Subversion, CVS, Perforce, Mercurial, Git, Bazaar, and Darcs, Changes is shaping up […]

Subversion and TextMate

Another post in my series on subversion, a free, open source version control system:

Subversion Subversion, Serendipity, and Discipline Subversion and the Single User LaTeX and Subversion Circle Six Subversion Subverting Difference

Today we’ll look at three ways that subversion interacts with my favorite text editor, TextMate:

TextMate’s subversion repository TextMate’s subversion integration Keeping local modifications to TextMate in sync across multiple computers with subversion

TextMate’s […]

Subverting Difference

Subversion allows you to compare the differences between revisions of a given document with the command:

svn diff

Let’s begin with the simplest and most common use of this command. But first a bit of terminology. Each time a change is committed to the repository its revision number increments. Revision keywords can be used instead of revision […]

Diff Programs Diffed

In my very first post, I mentioned that a lot of tools for programmers are readily adapted to the task of writing. When writing long, complex documents, it is sometimes necessary to compare versions. If you have embraced the power of plain text, a diff program can help. Diff programs display differences between files. This […]

ATPM on Activity Monitor

As I mentioned in my initial post, learning about the UNIX underpinnings of OS X was a revelation. While I would never like to work exclusively in a text based terminal, a lot of UNIX utilities can be exploited by writers as well as coders. While visual editing familiar from word processors tends to obscure […]

FireStats icon Powered by FireStats