Comments on: Using FileMerge with subversion

By: Mark’s Link Blog » links for 2007-10-03

Mark’s Link Blog » links for 2007-10-03 — Wed, 03 Oct 2007 06:20:28 +0000

[...] bbum’s weblog-o-mat » Blog Archive » Using FileMerge with subversion (tags: development diff mac osx subversion tips svn) [...]

By: Jim

Jim — Sat, 08 Oct 2005 15:34:46 +0000

err.. I don’t know how to make these new fangled blog things work.

replace the line that reads:
return “%s-%s-%s” % (match.group(‘filename’), version, randomString.next())
with:
return “%s-%s-%s” % (version, randomString.next(), match.group(‘filename’))

By: Jim

Jim — Sat, 08 Oct 2005 15:32:13 +0000

thanks Bill! FileMerge is pretty. much better than this:

60c60 return "%s-%s-%s" % (version, randomString.next(), match.group('filename'))

which, by the way, will fix things so that FileMerge gives you the function call pop-up menus for each file. FileMerge looks at the extension to determine the type of code it’s parsing, so you need to put the real filename last to have the pop-ups appear.

By: Clever Name TBD

Clever Name TBD — Fri, 19 Aug 2005 18:38:41 +0000

FileMerge and Subversion

Bill wrote up a blurb on using FileMerge with Subversion which reminded me that I had already written a couple of tools in that vein, so I’m posted them.

By: Ron

Ron — Wed, 03 Aug 2005 20:54:16 +0000

I know the post is really about SVN, but I couldn’t resist.

MythBusters did a show where they tested the ability of gold fish to remember and found it was considerably longer than 10 or 30 seconds. Like days.

By: Lee Phillips

Lee Phillips — Wed, 03 Aug 2005 15:02:15 +0000

Thank you for doing this! Having the diffs pop up in FileMerge is sweet!

I put your script in /usr/local/bin and it worked without having to tell svn the path.

I also have no use for BBEdit, and insist on Cocoa text entry (I use TextExtras). The nce thing is that if something better than FileMerge comes along your script can easily be modified to use that.

By: Gavin Eadie

Gavin Eadie — Wed, 03 Aug 2005 01:15:52 +0000

You already noted that BBEdit didn’t fit the bill, and XCode, of course, has the same capability. I’ve found SvnX to be quite useful, though, again, no emacs !

By: Mark Rowe

Mark Rowe — Wed, 03 Aug 2005 00:16:51 +0000

I've tweaked svkdiffshim.py to work correctly with SVK as well as Subversion. A patch is at http://bdash.net.nz/files/svndiffshim-svk.patch.

By: mikeash

mikeash — Tue, 02 Aug 2005 19:58:30 +0000

I just noticed your post to my blog post, so I thought I’d reciprocate. It’s nice to see that someone got some use out of the post, and even nicer to see that it’s been improved upon.

By: Christopher Elkins

Christopher Elkins — Tue, 02 Aug 2005 17:03:05 +0000

FWIW, I use a shell script bundled with svnX that accomplishes nearly the same thing (sans the revision in the title bar).

Re: “It has to be an absolute path (I ought to file a bug against subversion about that).”

That’s not my experience. I copied svndiffshim.py to a bin dir in my PATH and added “diff-cmd = svndiffshim.py” to ~/.subversion/config, and it worked just fine.