Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Blame info unclear

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Blame info unclear

Author steveking
Full name Stefan Küng
Date 2011-05-06 09:19:12 PDT
Message On 05.05.2011 10:08, Simon Large wrote:
> On 30 April 2011 07:43, Simon Large<simon.torto​isesvn at gmail dot com>​ wrote:
>> On 3 March 2010 17:58, Stefan Küng<tortoisesvn@​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/b​ranches/1.6.x/src/To​rtoiseShell/RemoteCa​cheLink.cpp


with the latest nightly build returns one merged line:

G 232 15770 15771 18.03.2009 20:42:21
/trunk/src/TortoiseS​hell/RemoteCacheLink​.cpp tortoisesvn
                            if
(CreateProcess(sCach​ePath.GetBuffer(sCac​hePath.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?

Stefan

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

« Previous message in topic | 9 of 19 | Next message in topic »

Messages

Show all messages in topic

Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-01 00:37:24 PST
     Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-01 04:27:52 PST
         Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-01 18:14:10 PST
             Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-02 00:56:17 PST
                 Blame info unclear "Davison, Steve D" <steve dot d dot davison at intel dot com> "Davison, Steve D" <steve dot d dot davison at intel dot com> 2010-03-02 15:12:19 PST
                     Re: Blame info unclear steveking Stefan Küng 2010-03-03 09:59:01 PST
                         Re: Blame info unclear simonlarge Simon Large 2011-04-29 23:43:40 PDT
                             Re: Blame info unclear simonlarge Simon Large 2011-05-05 01:08:10 PDT
                                 Re: Blame info unclear steveking Stefan Küng 2011-05-06 09:19:12 PDT
                                     Re: Blame info unclear simonlarge Simon Large 2011-05-06 15:51:52 PDT
                                         Re: Blame info unclear steveking Stefan Küng 2011-05-06 22:53:13 PDT
                                             Re: Blame info unclear simonlarge Simon Large 2011-05-07 13:50:26 PDT
                                                 Re: Blame info unclear steveking Stefan Küng 2011-05-07 23:18:02 PDT
                                                     Re: Blame info unclear simonlarge Simon Large 2011-05-10 13:27:11 PDT
                 Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-02 19:51:29 PST
                     Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-03 04:14:32 PST
                         Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-03 08:55:10 PST
                             Re: Branch and Merge problem? doomster Ulrich Eckhardt 2010-03-04 03:56:45 PST
                                 Re: Branch and Merge problem? Edwin <edwintai at gmail dot com> Edwin <edwintai at gmail dot com> 2010-03-07 18:37:22 PST
Messages per page: