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

Re: Merge tracking and Blame

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-09-21 22:30:44 CEST

On 21/09/2007, Stefan Küng <tortoisesvn@gmail.com> wrote:
> On 9/20/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
>
> > > 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
>
> Why would you want to ever see the author who merged certain lines in
> a blame? There's no reason to add an option for this in TSVN (btw:
> subclipse has it enabled all the time too).
>
> > 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?
>
> As I said, there's a new menu entry in TortoiseBlame. Check it out and
> you'll see.

I just installed last night's nightly and I can't see anything new
apart from showing merged paths, which I already mentioned. You can
use that to find out which lines got there because of a merge, but it
takes a lot of screen space (1% german screen width, 20% english
screen width). I was just looking for a very compact indicator that
'merges took place on this line'. Actually, to be honest I'm only
saying this because the CLI does it. I don't know whether it is really
useful.

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
Received on Fri Sep 21 22:30:51 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.