[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

macosx FileMerge script

From: Rob Clark <robdclark_at_mac.com>
Date: 2002-12-27 03:42:55 CET

Here is a script that I whipped up run after a "svn up" to find files
in a conflicted state, and run FileMerge.app (aka opendiff) to resolve
the conflicts. I suppose the opendiff could be replaced with some
other diff/merge tool on other platforms to accomplish basically the
same thing.

If I could figure out some way to make opendiff not return immediately,
I would probably add an "svn resolve" after opendiff returns a
successful error code.

-- Rob

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Fri Dec 27 03:44:14 2002

This is an archived mail posted to the Subversion Dev mailing list.