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

Re: [tortoisesvn] r21192 committed - Use a TaskDialog when asking for the more suitable path.

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 20 Apr 2011 22:15:54 +0200

On 20.04.2011 22:10, Simon Large wrote:
> On 20 April 2011 20:15,<tortoisesvn_at_googlecode.com> wrote:
>> Revision: 21192
>> Author: tortoisesvn
>> Date: Wed Apr 20 12:14:37 2011
>> Log: Use a TaskDialog when asking for the more suitable path.
>> http://code.google.com/p/tortoisesvn/source/detail?r=21192
>>
>> Modified:
>> /trunk/src/Resources/TortoiseMergeENG.rc
>> /trunk/src/TortoiseMerge/MainFrm.cpp
>> /trunk/src/TortoiseMerge/resource.h
>> /trunk/src/TortoiseMerge/stdafx.h
>>
>> =======================================
>> --- /trunk/src/Resources/TortoiseMergeENG.rc Wed Apr 20 11:07:17 2011
>> +++ /trunk/src/Resources/TortoiseMergeENG.rc Wed Apr 20 12:14:37 2011
>> @@ -1991,3 +1991,15 @@
>>
>>
>>
>> +
>> + # e n d i f
>> +
>> +
>> +
>> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
>> +
>> + # e n d i f / / n o t A P S T U D I O _ I N V O K E D
>> +
>> +
>> +
>> +
>
> Google's diff is really broken. This is nothing like the change to
> that file. I think there is an issue with diffing unicode files.
>
> While looking at that I notice stdafx.h has lost its svn:eol-style property.

Really? the property is there in my wc. Set to 'native'.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2721918
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-20 22:15:58 CEST

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