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

Re: Blame info unclear

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 06 May 2011 18:19:04 +0200

On 05.05.2011 10:08, Simon Large wrote:
> On 30 April 2011 07:43, Simon Large<simon.tortoisesvn_at_gmail.com> wrote:
>> On 3 March 2010 17:58, Stefan Küng<tortoisesvn_at_gmail.com> wrote:
>>> On 03.03.2010 00:11, Davison, Steve D wrote:
>>>> I can't seem to find any explanation of what the columns of
>>>> the blame output (as shown in Tortoise Merge) mean. The
>>>> number of columns shown by Of course, all except for the 2
>>>> revision columns at the left are pretty obvious.
>>>> So why are there 2 revision columns, and what do they mean?
>>>> So far, I don't think I've ever seen the two numbers
>>>> differ. It also seems strange that when blaming
>>> One revision is the rev where the line was last modified. The other
>>> revision shows you when the line was last modified but ignoring changes
>>> due to merging.
>> Responding to a year-old thread. I just tried this by showing the log
>> for a file I know has a lot of merges. In the log dialog check the
>> "include merged revisions" box so that merge sources that svn knows
>> about show up in grey. Right click on a revision that has a greyed
>> source below it and "Blame..." taking the text file option or "Blame
>> changes". The resulting output shows the merged revision in both
>> columns for lines affected by that merge.
> Bump. Any clues, anyone?

Blaming the file

with the latest nightly build returns one merged line:

G 232 15770 15771 18.03.2009 20:42:21
/trunk/src/TortoiseShell/RemoteCacheLink.cpp tortoisesvn
(CreateProcess(sCachePath.GetBuffer(sCachePath.GetLength()+1), NULL,
NULL, NULL, FALSE, 0, 0, 0, &startup, &process)==0)

And there the revs differ.

The same is returned when I run
svn blame -g RemoteCacheLink.cpp > RemoteCacheLink.txt

So what exactly is the problem here?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-06 18:19:15 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.