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

Re: svn diff and gvimdiff

From: Bryan Yeung <bryeung_at_gmail.com>
Date: 2004-11-24 20:21:44 CET

Thanks very much: that is exactly what I was looking for.

Can someone point me at some guidelines/procedures for producing
patches for the documentation? I'd be happy to write up something
about this.

Bryan

On 24 Nov 2004 13:08:42 -0600, kfogel@collab.net <kfogel@collab.net> wrote:
> Bryan Yeung <bryeung@gmail.com> writes:
>
>
> > I would like to use gvimdiff to display the diff from svn diff. Is
> > there a way to do this? Right now I get the following (from bash with
> > 'set -x'):
> >
> > > + svn diff --diff-cmd=gvimdiff Tag.java
> > > Index: Tag.java
> > > ===========================================...=
> > > 4 files to edit
> > > E282: Cannot read from "-L"
> >
> > It looks like svn diff is not passing what I think it should be to
> > gvimdiff. In fact, it looks like gvimdiff is trying to open "-L" as
> > one of the files to be diffed.
> >
> > I took a quick look around google and in the svn book but I couldn't
> > find any information about how svn calls the supplied diff command.
>
> It really should be documented, you're right (patches welcome, of
> course!). I think the relevant place to look is here:
>
> http://www.endrun.org/xr/svn/source/subversion/libsvn_subr/io.c, in
> the function svn_io_run_diff() (begins at line 1702). The diff_cmd
> gets
>
> -L label1 -L label2 frompath topath
>
> as arguments, it looks like. So you should write a wrapper script to
> absorb the arguments you don't need and/or transform them into ones
> you can use. The wrapper would invoke your real diff program.
>
> -Karl
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 24 20:24:19 2004

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