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

Re: A bug of TortoiseMerge。

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 11 Apr 2012 18:48:30 +0200

On 11.04.2012 06:36, 火凤凰 wrote:
> Hello,have been usingTortoiseSVN,which documentcomparisontool
> TortoiseMergevery good use,but recentlythisupdate,discover
> aproblem,several tests,only to findthe cause of the problem.
>
> Reproduciblephenomenaas follows:if thefile hasan odd number
> ofChinesecharacters,then useTortoiseMergecompared to the time ofthe
> line(includingthe line)after thetext.This makes it easy forpeople to
> thinkthe filebehindnocontent.
>
> This is an example:1.txt filecontentis "中",the 2.txt filecontent as "中
> 国",in contrastwithTortoiseMergewill find the 1.txtfile is empty。
>
> Looking forward to your reply。
> ver:
> TortoiseSVN 1.7.6, Build 22632 - 32 Bit , 2012/03/08 18:29:39

I'm not sure I understand the problem. I've created two files (attached)
with your example content.
Diffing those two files works just fine: TMerge shows the line as different.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2947378
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

  • application/x-zip-compressed attachment: files.zip
Received on 2012-04-11 18:48:40 CEST

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