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

Re: Merge always thinks first and last lines are different?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 30 Mar 2010 19:55:00 +0200

On 29.03.2010 22:31, Cory Riddell wrote:
> On 3/29/2010 12:45 PM, Stefan Küng wrote:
>> On 29.03.2010 18:58, Cory Riddell wrote:
>>> When I select
>>> two file versions to diff, TortoiseMerge seems to always think the first
>>> and last lines of the file differ. Or rather it behaves as if the lines
>>> differ.
>> If the lines don't show up as different, i.e., they are not differently
>> colored, then the lines are not different. Just having the box appear
>> doesn't mean the lines are different. Only the coloring and the icons at
>> the left of the views indicate a diff.
> Is there something special about the first and last lines? I would
> expect pressing the next difference button should do exactly that - send
> me to the next difference. If there are no more differences, the button
> should be disabled or at least do nothing. It doesn't make much sense
> (to me) for it to jump to some arbitrary point later in the file. I
> figured there must be some reason, technical or philosophical, for it do
> behave as it does. Do you know if there is a reason?

In 1.6.x, the prev/next diff also stops at the beginning/end of a file.
In trunk however, the behavior is as you want: the buttons get disabled
if there is no prev/next diff anymore.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-30 19:55:09 CEST

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

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