[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: svn diff: properties?

From: C. Scott Ananian <cananian_at_lesser-magoo.lcs.mit.edu>
Date: 2001-09-07 00:27:46 CEST

On 6 Sep 2001, Ben Collins-Sussman wrote:

> "C. Scott Ananian" <cananian@lesser-magoo.lcs.mit.edu> writes:
> > I think that, to maximally enable collaboration, it would be great if we
> > provided a sort of patch++ format that could handle these sorts of
[...]
> Look at my previous mail about editors. We already have an XML
> "patch++" format. It essentially describes everything that an
[...]
> We expected that someday (it's been a year!) people might use this
> format to post patches to mailing lists. :-)

If you want people to post it to mailing lists, the patch format has to be
human browsable. This:
<text-delta
   id="3">U1ZOAAAAHQQZlkQOg1RoaXMgaXMgYWRkZWQgZmlsZSBuZXcxLgo=
</text-delta>
is not human-intelligible, even if it is "plain text".

But the properties diffs are reasonable; if the XML diff were extended to
support a <diff-delta> element (as a human-readable 'diff -u' format
alternative to <text-delta>) you might end up with a patch format which is
*both* gnu-patch *and* svn-friendly: patch will ignore lines it doesn't
understand, while svn would be able to use those extra lines to encode
property information.

I propose 'svn xdiff' to generate this output.
 --s

UKUSA Washington COBRA JANE assassination payment Morwenstow World Trade Center
terrorist jihad AES Castro Mk 48 LA Peking Cocaine agent FSF Kojarena
              ( 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:40 2006

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