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

Re: --diff-cmd doesn't use -u per default

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: Tue, 10 Jun 2008 10:51:47 +0200

On Tue, Jun 10, 2008 at 10:10:58AM +0200, Jens Seidel wrote:
> I noticed that I had to rewrite my little vimdiff wrapper for svn diff
> again for 1.5.x. In the past -u was provided as first argument, now it
> isn't.

I also wonder why a temporary copy is provided to the diff command. This
is probably required if the comparision is not against BASE.
Nevertheless I like to edit the file in the diff viewer as well and have
to parse option 2 or 4.

Current parameters:
#1=-L
#2=../src/file.c (Revision 1584)
#3=-L
#4=../src/file.c (Arbeitskopie)
#5=../src/.svn/text-base/file.c.svn-base
#6=/tmp/svndiff.3.tmp
#7=
#8=

my script:

#!/bin/sh
LEFT=${4}
RIGHT=${5}

LEFT=$(echo "$LEFT" | sed 's/[\t ]([^()]*)//')
vimdiff "+set wrap" "+wincmd l" "+set wrap" "+wincmd h" $LEFT $RIGHT

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-10 10:55:24 CEST

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.