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

Re: svn diff bug

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 07 Dec 2012 09:36:03 +0000

Stefan Sperling <stsp_at_elego.de> writes:

> On Thu, Dec 06, 2012 at 12:28:59PM -0500, Phil Shafer wrote:
>> I'm seeing an inaccurate diff chunk in "svn diff" output. To reproduce this:
>>
>> svn checkout http://libslax.googlecode.com/svn/trunk/ libslax-read-only
>> cd libslax-read-only/
>> svn diff -c342 doc/oxtradoc/rfc2629-to-html.slax
>>
>> The output I see is:
>>
>> Index: doc/oxtradoc/rfc2629-to-html.slax
>> ===================================================================
>> --- doc/oxtradoc/rfc2629-to-html.slax (revision 341)
>> +++ doc/oxtradoc/rfc2629-to-html.slax (revision 342)
>> @@ -2696,6 +2696,7 @@
>> vertical-align: top;
>> }
>> table.full {
>> + border-style: outset;
>> border-style: outset;
>> border-width: 1px;
>> background-color: lightyellow;
>>
>> But this is not accurate:
>
> I cannot reproduce it with a Subversion trunk build, nor with a
> build of Subversion's 1.7.x branch (about to become 1.7.8).

I can:

$ svn cat -r341 http://libslax.googlecode.com/svn/trunk/doc/oxtradoc/rfc2629-to-html.slax > f.341
$ svn cat -r342 http://libslax.googlecode.com/svn/trunk/doc/oxtradoc/rfc2629-to-html.slax > f.342
$ diff -u f.34?
--- f.341 2012-12-07 09:31:29.121339881 +0000
+++ f.342 2012-12-07 09:31:36.749340307 +0000
@@ -2696,6 +2696,7 @@
 table.full {
   border-style: outset;
   border-width: 1px;
+ margin-left: 3em;
   background-color: lightyellow;
   padding: .25em;
   -moz-box-shadow: 0 0 4px #000000;

$ svnadmin create repo
$ svnmucc -mm put f.341 file://`pwd`/repo/f
$ svnmucc -mm put f.342 file://`pwd`/repo/f
$ svn diff -c2 file://`pwd`/repo/f
Index: f
===================================================================
--- f (revision 1)
+++ f (revision 2)
@@ -2696,6 +2696,7 @@
   vertical-align: top;
 }
 table.full {
+ border-style: outset;
   border-style: outset;
   border-width: 1px;
   background-color: lightyellow;

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2012-12-07 10:36:41 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.