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

Re: TortoiseSVN Blame and merge tracking

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 08 Sep 2008 16:38:31 +0200

Snakefoot wrote:
> On Sep 4, 8:01 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
>> I can't seem to reproduce this. But I *think* it should work as of
>> r13825. Not sure though...
> I have tested again with TortoiseSVN 1.5.3 Build 13835, and I can
> reproduce both cases:
> 1) Continues to display the first line as being from the feature
> branch, while the following 9 lines are from year 2005 (Though all 10
> lines are from the same commit to the feature branch)

Try the command line client (svn blame -g).
The lines reported in TortoiseBlame are received via the svn API, and if
those are wrong I suspect that the bug is in the library.

> The "Show Changes" behavior have changed though:
> - When right-clicking the first line (rev. 39248) and select "Show
> Changes", then it diffs 39330 and 39331 (diff of merge-commit)
> - When right-clicking one of the the 9 lines (rev. 15768) and select
> "Show Changes", then it diffs 39330 and 39331. (diff of merge-commit)

That's correct. It diffs the revisions where the change was committed.

> I would expect that all 10 lines should say they come from rev 39248,
> and when choosing "Show Changes", then it should display the changes
> of rev. 39248. But I wouldn't mind keeping the option of being able to
> see the modifications of the entire merge-commit to that file.

rev 39248 won't have any changes on that particular path/url: that
revision had the changes done on the *other* branch (which got merged
later). So TortoiseBlame must execute the diff for the revision where
the merge was committed, *not* the original revision.


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

Received on 2008-09-08 16:39:05 CEST

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