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

Re: Problem with diff

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Tue, 18 Oct 2011 10:32:36 +0200

Andreas Krey wrote on Tue, Oct 18, 2011 at 06:04:12 +0200:
> On Mon, 17 Oct 2011 14:21:02 +0000, Adam Miazga wrote:
> > Hi.
> >
> > I have one "magick" file (in attachment).
> > I commit this file to repository. I add line
> > "/**/"
> > into end of file. And again I commit the file to repository.
> >
> > When i invoke "svn diff -r n:m kadr.polon.p" i recive
> >
> > in Subversion 1.6
> > Index: kadr.polon.p
> > ===================================================================
> > --- kadr.polon.p (revision 7)
> > +++ kadr.polon.p (revision 8)
> > @@ -463,3 +463,5 @@
> > IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
> > END.
> > {ws_i/log.i}
> > +
> > +/**/
>
> Same here (with -rc2, actually). Run:
>
> =========
> #!/bin/sh
> rm -rf svntmp
> mkdir svntmp
> cd svntmp
> svnadmin create repo
> svn checkout file://`pwd`/repo wc
> cd wc
> cp ../../kadr.polon.p .
> svn add kadr.polon.p
> svn commit -m 1
> cat >>kadr.polon.p <<EOF
>
> /**/
> EOF
> svn diff
> exit
> =========
>
> in a directory with the original file and get
>

Thanks for the self-contained recipe!

Using it I cannot reproduce the bug using either 1.6.12, 1.7.0, or
trunk. I'm on a 32-bit Linux system, using apr/apr-util as shipped with
httpd 2.2.19/2.3.15; I'll try later in other environments.

> ===================================================================
> --- kadr.polon.p (revision 1)
> +++ kadr.polon.p (working copy)
> @@ -461,6 +461,8 @@
> EMPTY TEMP-TABLE tt_tytnauk.
> EMPTY TEMP-TABLE tt_stnauk.
> pOstatni = vIlosc.
> + IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
> +END.
> IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
> END.
> {ws_i/log.i}
>
> as the diff.
>
> But happens only with this specific file; can't reproduce with
> other content.
>
> Andreas
>
> --
> "Totally trivial. Famous last words."
> From: Linus Torvalds <torvalds@*.org>
> Date: Fri, 22 Jan 2010 07:29:21 -0800
Received on 2011-10-18 10:33:28 CEST

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.