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

Problem with diff

From: Adam Miazga <adammiazga_at_gmail.com>
Date: Mon, 17 Oct 2011 14:21:02 +0200

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}
+
+/**/

in Subversion 1.7
Index: kadr.polon.p
===================================================================
--- kadr.polon.p (revision 7)
+++ kadr.polon.p (revision 8)
@@ -460,6 +460,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}

When i change last line from "/**/" to "some new line" svn diff display this

1.6
Index: kadr.polon.p
===================================================================
--- kadr.polon.p (revision 8)
+++ kadr.polon.p (revision 9)
@@ -464,4 +464,4 @@
END.
{ws_i/log.i}

-/**/
\ No newline at end of file
+some new line
\ No newline at end of file

1.7
Index: kadr.polon.p
===================================================================
--- kadr.polon.p (revision 8)
+++ kadr.polon.p (revision 9)
@@ -461,7 +461,7 @@
    EMPTY TEMP-TABLE tt_stnauk.
    pOstatni = vIlosc.
    IF vIlosc = (pStart + pIlosc - 1) then leave Global_loop.
-END.
+END.
 {ws_i/log.i}

 /**/
\ No newline at end of file

Best regards
Adam Miazga

Received on 2011-10-17 16:27:44 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.