On 14 May 2011 15:59, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 12.05.2011 21:57, Simon Large wrote:
>> Hi Stefan,
>> I notice that when formatting the revision numbers for a text-mode
>> blame you use %6d. The Apache repository is now in 7 digits. I would
>> suggest %8d as a safer width.
>> In TBlame, merged lines are shown in italics (I remember this was
>> discussed some time ago) but it doesn't show up very clearly as being
>> different, at least not on my Win7 laptop. Is there any other way of
>> marking those lines? Maybe a * between revision and author.
> Ok, done.
>> In one file I just blamed there are 2 different paths shown (view
>> merge paths). Where lines were merged then it shows the merge source.
>> But the non-merged lines are a real mixture. I think that is because I
>> created the file using an SVN copy, so it shows the original path for
>> lines which were not changed since the copy took place. Correct? If so
>> then it is not just showing the merge path but the path where that
>> line last changed. Is that information only available when you get the
>> full merge info?
> The merge info returned by the svn lib is sometimes not very intuitive.
> What I noticed is that if you merge changes, then modify another line on
> the branch before you commit that merge, that line gets a merged
> path/url from the merge, but the merge revision isn't set.
> Not sure what's happening in your case though. Maybe you should ask on
> the svn list for a detailed explanation.
I think these paths are not particularly related to merging. Each line
has a revision and a path, showing when that line was last changed and
the path of the file in that revision. That's why I asked if the path
info is only available with merge info.
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-17 00:53:13 CEST