Re: Merge tracking and Blame

On 20/09/2007, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Simon Large wrote:
> > Hi folks,
> >
> > The SVN merge tracking docs state that Blame should be able to show
> > the original author/revision/log or the merge author/rev/log for
> > merged revisions. I seem to remember some discussion about this, but
> > can't see it in a recent build or in the issue tracker. Is it on the
> > todo list or have I just missed it?
>
> It already works, as long as the server knows about merge tracking. If
> the server doesn't know merge tracking yet (< 1.5 versions), the blame
> works as before.
> There's also a new menu entry in TortoiseBlame...

What I'm getting at is that the CLI gives you an option (-g) for
displaying the original author, but you can choose to display the
merge author (old default behaviour). Also, the CLI indicates the
merged lines with a G when displaying original authors. Merged paths
also shows where the merged lines are if you read carefully, but it
takes a lot of space. Maybe put the line number in italics for merged
lines, or change the background colour for the line number or
something as a simple merge indicator?

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org