You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Phil Shafer <ph...@gmail.com> on 2012/12/06 18:28:59 UTC

svn diff bug

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:

% grep -A3 'table.full {' doc/oxtradoc/rfc2629-to-html.slax
table.full {
  border-style: outset;
  border-width: 1px;
  margin-left: 3em;

The "margin-left" line is the line I added during this commit.

I am running macosx (10.8.0) and svn version 1.7.6 (r1370777).

FWIW, I do _not_ see this issue on freebsd w/ svn version 1.6.6 (r40053).

Is this a known bug?  If not, where should I file it?

Thanks,
 Phil

---
Bock [trash/libslax-read-only]% uname -a
Darwin bock.juniper.net 10.8.0 Darwin Kernel Version 10.8.0: Tue Jun  7 16:33:36 PDT 2011; root:xnu-1504.15.3~1/RELEASE_I386 i386
Bock [trash/libslax-read-only]% svn --version
svn, version 1.7.6 (r1370777)
   compiled Aug 24 2012, 12:50:58


Re: svn diff bug

Posted by Stefan Sperling <st...@elego.de>.
On Fri, Dec 07, 2012 at 09:48:18AM +0000, Philip Martin wrote:
> Philip Martin <ph...@wandisco.com> writes:
> 
> > Stefan Sperling <st...@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:
> 
> I've raised issue 4270:
> http://subversion.tigris.org/issues/show_bug.cgi?id=4270

Thanks Philip!

Re: svn diff bug

Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:

> Stefan Sperling <st...@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:

I've raised issue 4270:
http://subversion.tigris.org/issues/show_bug.cgi?id=4270

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download

Re: svn diff bug

Posted by Philip Martin <ph...@wandisco.com>.
Stefan Sperling <st...@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

Re: svn diff bug

Posted by Stefan Sperling <st...@elego.de>.
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:
> 
> % grep -A3 'table.full {' doc/oxtradoc/rfc2629-to-html.slax
> table.full {
>   border-style: outset;
>   border-width: 1px;
>   margin-left: 3em;
> 
> The "margin-left" line is the line I added during this commit.
> 
> I am running macosx (10.8.0) and svn version 1.7.6 (r1370777).
> 
> FWIW, I do _not_ see this issue on freebsd w/ svn version 1.6.6 (r40053).

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).

> Is this a known bug?  If not, where should I file it?

As this problem seems to have fixed itself, it was probably
a temporary glitch with googlecode.

Googlecode uses a custom big-table-based Subversion filesystem
backend, and who knows what kinds of other hacks^Wtechnology,
in their infrastructure.  Google code repositories are *not*
standard Subversion repositories.