You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Stefan Küng <to...@gmail.com> on 2006/06/10 11:34:23 UTC

svn blame in 1.4.0 shows different results than 1.3.x

Hi,

Another one found by TSVN nightly build users. 'svn blame' shows 
completely different results for 1.3.x and 1.4.0-dev clients.

To reproduce:

with svn.exe version 1.3.2:
svn blame 
http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/trans_tests.py 
-r 1:HEAD > blame132.txt

with svn.exe built from the 1.4.x branch:
svn blame 
http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/trans_tests.py 
-r 1:HEAD > blame140.txt

So, execute the very same blame command with both clients. Then compare 
the two resutling files:

The blame240.txt file doesn't contain lines which have revisions < 4552 
(ok, haven't really checked *every* revision, but you get the point). 
While the blame132.txt file has lines with revision numbers as low as 
851. It seems as if the 1.4.0 client doesn't really do the blame from 
revision 1 to HEAD but from revision 4552 to HEAD.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn blame in 1.4.0 shows different results than 1.3.x

Posted by Stefan Küng <to...@gmail.com>.
D.J. Heap wrote:
> On 6/10/06, Malcolm Rowe <ma...@farside.org.uk> wrote:
>> On Sat, Jun 10, 2006 at 01:03:29PM +0100, Malcolm Rowe wrote:
>> > Note that the prior revision to r4552 on trans_tests.py, r4371, set
>> > svn:eol-style to native.  That said, I'm unable to reproduce the 
>> problem
>> > you're seeing using trunk or a fairly recent version of the 1.4.x 
>> branch.
>> >
>>
>> ... on Linux.
>>
> 
> 
> Using the extended diff options to ignore eol-style also works for me
> on Windows (ie, svn.exe blame -x--ignore-eol-style build.conf).  Can
> you try passing the --ignore-eol-style option to the new blame
> (svn_client_blame3)?

Yes, with that option, svn blame works the same with 1.4.0 as it does 
with 1.3.2 (of course, that one doesn't have that option).

Confirmed this on XP SP2.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn blame in 1.4.0 shows different results than 1.3.x

Posted by "D.J. Heap" <dj...@gmail.com>.
On 6/10/06, Malcolm Rowe <ma...@farside.org.uk> wrote:
> On Sat, Jun 10, 2006 at 01:03:29PM +0100, Malcolm Rowe wrote:
> > Note that the prior revision to r4552 on trans_tests.py, r4371, set
> > svn:eol-style to native.  That said, I'm unable to reproduce the problem
> > you're seeing using trunk or a fairly recent version of the 1.4.x branch.
> >
>
> ... on Linux.
>


Using the extended diff options to ignore eol-style also works for me
on Windows (ie, svn.exe blame -x--ignore-eol-style build.conf).  Can
you try passing the --ignore-eol-style option to the new blame
(svn_client_blame3)?

DJ

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn blame in 1.4.0 shows different results than 1.3.x

Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Sat, Jun 10, 2006 at 01:03:29PM +0100, Malcolm Rowe wrote:
> Note that the prior revision to r4552 on trans_tests.py, r4371, set
> svn:eol-style to native.  That said, I'm unable to reproduce the problem
> you're seeing using trunk or a fairly recent version of the 1.4.x branch.
> 

... on Linux.

Regards,
Malcolm

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn blame in 1.4.0 shows different results than 1.3.x

Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Sat, Jun 10, 2006 at 01:34:23PM +0200, Stefan Küng wrote:
> The blame240.txt file doesn't contain lines which have revisions < 4552 
> (ok, haven't really checked *every* revision, but you get the point). 
> While the blame132.txt file has lines with revision numbers as low as 
> 851. It seems as if the 1.4.0 client doesn't really do the blame from 
> revision 1 to HEAD but from revision 4552 to HEAD.
> 

Note that the prior revision to r4552 on trans_tests.py, r4371, set
svn:eol-style to native.  That said, I'm unable to reproduce the problem
you're seeing using trunk or a fairly recent version of the 1.4.x branch.

Regards,
Malcolm

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

RE: svn blame in 1.4.0 shows different results than 1.3.x

Posted by Lieven Govaerts <lg...@mobsol.be>.
I've tested it on my linux box with 1.4_RC1, and there it isn't a problem.
But on windows XP with current trunk it is. 

My guess is that it has something to do with the solution for #2431 'svn
blame' ignores eol-style.

I'll try to make a testcase for it this weekend.

Lieven.

> -----Original Message-----
> From: Stefan Küng [mailto:tortoisesvn@gmail.com] 
> Sent: zaterdag 10 juni 2006 13:34
> To: dev@subversion.tigris.org
> Subject: svn blame in 1.4.0 shows different results than 1.3.x
> 
> Hi,
> 
> Another one found by TSVN nightly build users. 'svn blame' 
> shows completely different results for 1.3.x and 1.4.0-dev clients.
> 
> To reproduce:
> 
> with svn.exe version 1.3.2:
> svn blame
> http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline
> /trans_tests.py
> -r 1:HEAD > blame132.txt
> 
> with svn.exe built from the 1.4.x branch:
> svn blame
> http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline
> /trans_tests.py
> -r 1:HEAD > blame140.txt
> 
> So, execute the very same blame command with both clients. 
> Then compare the two resutling files:
> 
> The blame240.txt file doesn't contain lines which have 
> revisions < 4552 (ok, haven't really checked *every* 
> revision, but you get the point). 
> While the blame132.txt file has lines with revision numbers 
> as low as 851. It seems as if the 1.4.0 client doesn't really 
> do the blame from revision 1 to HEAD but from revision 4552 to HEAD.
> 
> Stefan
> 
> -- 
>         ___
>    oo  // \\      "De Chelonian Mobile"
>   (_,\/ \_/ \     TortoiseSVN
>     \ \_/_\_/>    The coolest Interface to (Sub)Version Control
>     /_/   \_\     http://tortoisesvn.tigris.org
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org