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

Custom merge/diff tool feature request

From: Aaron Hillegass <info_at_bignerdranch.com>
Date: 2005-07-27 21:26:28 CEST

We are using subversion for all our source code for our applications
and our books. It is a great tool, and we are greatly indebted to
all of you. I do, however, have a suggestion for an improvement:

For most types of source code, the default line-based merge/diff
works beautifully. There are, however, other types of file that
might be mergeable: database files, nib files, compressed files. For
these, I would want to write a custom merge/diff tool. My tool would
have to take the same arguments as GNU diff.

Then, from the command-line, I can specify:
     svn diff --diff-cmd sqlite_diff foo.sql
     svn merge --diff3-cmd sqlite_diff foo.sql

But, what I really want is a way to configure subversion to use my
custom diff/merge for a given file type. I want a way to say: "For
any file with a .sql extension, use sql_diff instead of the standard
line-based merge/diff".

Aaron Hillegass
Big Nerd Ranch, Inc.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 27 23:41:01 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.