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

Re: [PATCH] Implement (l)aunch an external merge tool

From: Martin Furter <mf_at_rola.ch>
Date: 2007-10-02 18:02:54 CEST

On Mon, 1 Oct 2007, Eric Gillespie wrote:

> This is fine for now, but eventually I'd like to see us use
> format strings for this and for diff. Currently, people have to
> write scripts to massage GNU diff arguments into whatever their
> own diff tool works, and now they'd have to do the same for merge
> tools. Instead, we should offer something like this:
> # %L = left %R = right
> diff-command = mycrazydifftool %R %L
> # %B = base %T = theirs %M = mine %G = merged
> merge-command = mycrazymergetool %B %T %M %G

That sounds nice. But I propose to duplicate each of those variables,
always one for the path to the file and one for the name to display since
sometimes the filename is something like .svn/tmp/tempfile.tmp.
Maybe like this:

# files: %l = left %r = right
# display-names: %L = left %R = right
diff-command = mycrazydifftool --right-name %R --left-name %L %r %l

svn diff already creates those names and adds -L $name to the commandline,
for example -L 'Makefile (working copy)' or -L 'Makefile (revision 23)'.

Just my 2 cents.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 2 18:03:13 2007

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.