[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: Thu, 04 Sep 2008 20:01:01 +0200

Snakefoot wrote:
> Hi ya
>
> I have just performed my very first large merge from a feature branch
> to the trunk. To make it interesting, a few changes from the trunk was
> cherry picked to the feature branch. The final merge to trunk was
> performed using reintegration, and all changes was merged perfectly.
>
> I'm now checking whether TortoiseSVN blame is able to display the
> merged revisions properly, and generally the blame-functionality works
> wonderful.
>
> But I have a few cases where something odd happens:
>
> 1) Have a merged checkin with original revision 39248 (2008-26-08),
> which adds 10 new lines to a file. The blame believes that 9 of these
> lines was added at revision 15768 (14-19-2005).
> - When right-clicking the one line which correctly says revision
> 39248 and select "Show changes", then the title says 39248 but it
> shows an older revision of the file. The two panes says rev. 39247 and
> 39248, but cannot display any changes.
> - When right-clicking one of the other 9 lines and select "Show
> Changes", then it correctly displays the changes, but they do not
> include the ones that the blame believes are from that revision.
> - When doing a standard svn blame, then the 10 lines are marked as
> being from the merge-commit (39331)

Running diff/blame for selected revisions should work now (r13824)

>
> 2) The same merged checkin with original revision 39248 (2008-26-08)
> also modifies 6 lines in another line. The blame doesn't recognize
> these lines as coming from this revision, but says they arrived with
> the merge commit rev 39331
> - When showing the log for that file, and enables "Include merged
> revisions" then it correctly displays 39248 to be a merged revision.
> And when showing changes for that revision, then it correctly displays
> that the 6 lines was modified.
> - Other merge revisions to the same file are correctly shown as
> merged in the blame for that file.
> - When doing a standard svn blame, then the 6 lines are also marked
> as being from the merge-commit (39331)

I can't seem to reproduce this. But I *think* it should work as of
r13825. Not sure though...

Stefan

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

Received on 2008-09-04 20:01:18 CEST

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