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

Re: [SVN-DEV] Re: [Issue 422] Changed - "svn diff" needs to be fleshed out.

From: C. Scott Ananian <cananian_at_lesser-magoo.lcs.mit.edu>
Date: 2001-09-04 21:49:08 CEST

On 4 Sep 2001, Ben Collins-Sussman wrote:

> 1. svn diff foo.c
> 2. svn diff -r 5 -r 7 foo.c
> 3. svn diff -r 5 foo.c

So, are you saying that if the user has a (client-side) custom diff
program installed, that case 1 will behave (possibly radically)
differently from 2 and 3?

This seems like a misfeature. Why not check out the revisions into
temporary files and then run the client-side diff? Slightly more
inefficient, perhaps, but cooperates much better with the user's
preferences. (The 'efficient' way to do this is to generate *svn* diffs
between revisions, apply them to the working copy to create a pair of
temporary files, and *then* run the user's 'diff' program on the pair.
This way you get the efficiency of the server-side approach (since the
server "knows" the diffs) with the consistency of the client-side model.)
 --s

Dictionary planning President Bejing UKUSA Cocaine Iraq nuclear chemical agent
global action network munitions anthrax biowarfare early warning Indonesia
              ( http://lesser-magoo.lcs.mit.edu/~cananian )
 --
 "These students are going to have to find out what law and order is
 all about." -- Brig. General Robert Canterbury, Noon, May 4, 1970,
 minutes before his troops shot 13 unarmed Kent State students, killing 4.
 --
            [http://www.cs.cmu.edu/~dst/DeCSS/Gallery/]
#!/usr/bin/perl -w
# 526-byte qrpff, Keith Winstein and Marc Horowitz <sipb-iap-dvd@mit.edu>
# MPEG 2 PS VOB file on stdin -> descrambled output on stdout
# arguments: title key bytes in least to most-significant order
$_='while(read+STDIN,$_,2048){$a=29;$c=142;if((@a=unx"C*",$_)[20]&48){$h=5;
$_=unxb24,join"",@b=map{xB8,unxb8,chr($_^$a[--$h+84])}@ARGV;s/...$/1$&/;$d=
unxV,xb25,$_;$b=73;$e=256|(ord$b[4])<<9|ord$b[3];$d=$d>>8^($f=($t=255)&($d
>>12^$d>>4^$d^$d/8))<<17,$e=$e>>8^($t&($g=($q=$e>>14&7^$e)^$q*8^$q<<6))<<9
,$_=(map{$_%16or$t^=$c^=($m=(11,10,116,100,11,122,20,100)[$_/16%8])&110;$t
^=(72,@z=(64,72,$a^=12*($_%16-2?0:$m&17)),$b^=$_%64?12:0,@z)[$_%8]}(16..271))
[$_]^(($h>>=8)+=$f+(~$g&$t))for@a[128..$#a]}print+x"C*",@a}';s/x/pack+/g;eval

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:39 2006

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