[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: Snakefoot <sweaty1_at_gmail.com>
Date: Wed, 10 Sep 2008 08:24:28 -0700 (PDT)

On Sep 8, 4:38 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
>
> 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.
>

Just tried and the command-line client also displays the same
behavior. Time to search the svn-bug-base.

> > 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.

Don't mind the default to be the complete merge diff. But it would be
nice if there was an option to see the original diff, instead of the
complete merge diff. Instead of having to use the repo-browser to find
the same modification in the feature branch and then perform the diff
there of that revision. It would be enough to open the "Show Log"-
window with that specific revision, so one manually had to select the
file to see the modifications.

Best regards

-Rolf

---------------------------------------------------------------------
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-10 17:30:04 CEST

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