[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: Adam Miazga <adammiazga_at_gmail.com>
Date: Wed, 19 Oct 2011 10:17:56 +0200

Hi

Daniel try this way

1. download file from first message
2. commit this file without modification
3. add new line via
echo "test" >>kadr.polon.p
4. commit changed file
5.generate diff

I tried to repeat this situation with another file. All my attempts have failed.
This file have corrupted line endings and open and save this file in
editor which modfied line endings repaired it.

Successful attempts
Adam Miazga

2011/10/18 Andreas Krey <a.krey_at_gmx.de>:
> On Tue, 18 Oct 2011 17:54:41 +0000, Daniel Shahaf wrote:
> ...
>> svnmucc, and then append two lines and diff before/after committing,
>> but still couldn't reproduce your issue.
>
> I can't reproduce it on the linux box, either. At least not exactly.
> This is going to be fun.
>
> My apple produces (without any svn:prop):
>
> ===================================================================
> --- kadr.polon.p        (revision 1)
> +++ kadr.polon.p        (revision 2)
> @@ -461,6 +461,8 @@
>    447    EMPTY TEMP-TABLE tt_tytnauk.
>    448    EMPTY TEMP-TABLE tt_stnauk.
>    449    pOstatni = vIlosc.
> +   450    IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
> +   451 END.
>    450    IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
>    451 END.
>    452 {ws_i/log.i}
>
> and the linux box makes that
>
> ===================================================================
> --- kadr.polon.p        (revision 1)
> +++ kadr.polon.p        (revision 2)
> @@ -463,4 +463,6 @@
>    449    pOstatni = vIlosc.
>    450    IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
>    451 END.
> +   452 {ws_i/log.i}
> +
>    452 {ws_i/log.i}
>
> Uninitialized variable that then points to the wrong lines?
>
> Andreas
>
> --
> "Totally trivial. Famous last words."
> From: Linus Torvalds <torvalds@*.org>
> Date: Fri, 22 Jan 2010 07:29:21 -0800
>
Received on 2011-10-19 10:18:34 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.