Saturday, July 22nd, 2006 17:07 1.2 is now available, adding support for boolean values. It is a Python module which converts between Mac OS X XML property lists and Python data structures.

Thanks to Robert White for the addition.


Monday, October 3rd, 2005 21:44

mergesvn (not to be confused with svn merge) is a simple tool I wrote to resolve conflicts in Subversion working copies using the Mac OS X FileMerge application.

Given the name of a file with conflicts, it automatically finds the ".mine" and ".rN" files svn creates for a conflict. Saving the FileMerge window will overwrite the file; you must do svn resolved yourself. [Update: The above-linked version will run svn resolved for you.]

mergesvn source )