[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 8 Sep 2008 14:11:28 +0100

2008/9/8 Snakefoot <sweaty1_at_gmail.com>:
> 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)
>
> 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)
>
> 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.
>
> 2) Continues to display the merge-comment instead of the comment from
> the feature branch for the 6 lines.

You need to try the nightly build from trunk on /latest rather than
the 1.5.x branch. The version number will be 1.5.99.xxx

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-08 15:11:37 CEST

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