On 07.05.2011 00:51, Simon Large wrote:
> On 6 May 2011 17:19, Stefan Küng<tortoisesvn_at_gmail.com> wrote:
>> 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
>> https://tortoisesvn.googlecode.com/svn/branches/1.6.x/src/TortoiseShell/RemoteCacheLink.cpp
>>
>>
>> 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
>> if
>> (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?
>
> OK, I see Blame Changes is working. Blame with the text viewer also
> shows 2 revision columns, but there is no G and the revs don't differ.
How do you start blame? The line I pasted above is from a blame with
text viewer and it clearly shows the "G".
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2732280
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-07 07:53:16 CEST