On Aug 27, 2008, at 7:13 PM, Stephen Sinclair wrote:
On Wed, Aug 27, 2008 at 10:24 AM, ben@ekran.org wrote:
I keep forgetting to mark pd files as binary in my school svn and that often leads to svn attempting to merge them, which never works and requires manually editing the files.
The 'svn up' command takes an argument --diff3-cmd, which allows you to specify an external program to use for calculating merges. You could point it at a script which returns 'false' for .pd files, and passes other files through to 'diff'. I believe there's also a config file where you can set this so that you don't need to specify it every time.
Really it would be better if svn could be told not to auto-merge on update, but I think it can't. This made me think though: it would be a great project for someone to write a "Pd patch diff" program! :) To help visualize the diff between two patches. Could be fun...
I wrote pd-diff, which is a minor improvement, it's in pure-data/ scripts/pd-diff.
.hc
Steve
Pd-dev mailing list Pd-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
------------------------------------------------------------------------ ----
If nature has made any one thing less susceptible than all others of exclusive property, it is the action of the thinking power called an idea, which an individual may exclusively possess as long as he keeps it to himself; but the moment it is divulged, it forces itself into the possession of everyone, and the receiver cannot dispossess himself of it. - Thomas Jefferson