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

Re: functional equivalent to "cvs rdiff -s"?

From: Hiroharu Tamaru <tamaru_at_myn.rcast.u-tokyo.ac.jp>
Date: 2004-08-17 19:00:25 CEST

At Tue, 17 Aug 2004 10:18:45 -0600,
Nathan Dauchy wrote:

> However, for a more complex diff, like between two tags:
> $ svn diff -r HEAD:HEAD --old file:///SVN/tags/ver1/foo --new
> file:///SVN/tags/ver2/foo
> then how do I use "svn log", which only supports a single URL?
>
> It looks like for now I will just use something like this:
> $ svn diff -r HEAD:HEAD --old file:///SVN/tags/ver1/foo --new
> file:///SVN/tags/ver2/foo | grep -E "^Index:"
> which isn't terribly efficient and doesn't tell me whether the file was
> added, removed, or modified. But, it should be enough for my immediate
> needs.
>
> > If you'd like to see a new feature, write up a description of how you would
> > want it to behave (i.e. exactly what level of detail you would expect), and
> > post here.
> >
>
> I'll try to do that some time soon. In the meantime if anyone else has
> input into this feature, please chime in!

How about a custom diff like:
% cat mydiff
#!/bin/sh -
if [ ! -s "$6" -a -s "$7" ]; then
  echo " A $5"
elif [ -s "$6" -a ! -s "$7" ]; then
  echo " D $3"
else
  echo " M $5"
fi

and specify `--diff-cmd /path/to/mydiff' to the diff command
you gave above.

-- 
Hiroharu Tamaru
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 19:01:22 2004

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