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

Re: graphical diffs

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-11-12 17:46:00 CET

Greg Dickie <greg@max-t.com> writes:
> Is there an easy way to get a graphical diff from svn diff (eg: something
> like svn xdiff or a way to substitute which binary runs with diff)?

Not yet, but it would be an easy patch to write, once we've decided on
the interface.

   Option #1 (simplest):
      Add a `--diff-program' option to svn. It specifies what program
      to run for diff. The program will always be passed two
      arguments, and additional options can be passed to it via `-x'
      as usual.

   Option #2 (a little more complex):
      First, implement option #1. Then also add a run-time config
      option that associates file regexps with diff commands. The
      default regexp is ".*", and it runs 'diff' of course. See
      http://subversion.tigris.org/issues/show_bug.cgi?id=668 for
      a related issue.

   Option #3 (maybe this is going too far):
      First, implement option #2. Then create a new property,
      `svn:diff', whose value is a diff program to run and all the
      options, for example "xdiff -b". If the program can be found in
      PATH, it is used for that file. Otherwise, the default diff
      program is used.

This is just off the top of my head, though I'm fairly sure that
option #1 at least is a good idea. Would you have time to make a
patch for that first?

Thoughts, folks?,
-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 12 18:19:54 2002

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.