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

Re: TortoiseMerge recognising some file as binary?

From: Oto BREZINA <otik_at_printflow.eu>
Date: Wed, 14 Dec 2011 21:18:12 +0100

On 2011-12-14 19:58, Jean-Francois Cote wrote:
> 1) Can you check what is file C:\Users\username​AppData\Local\Tem​p\chcon-rev107623.s​vn001.tmp.cpp when you get error?
> This file seems to be containing the complete source file for this revision. I can open it with any text editor and Notepad++ is telling me that it's in ANSI format. There is not binary code.
If file contains two consequenced nul chars it is threaded as binary.
You can use hex viewer/editor to check that.
I would guess that downloading that revision (e.g. update to revision),
making change, and trying to diff with T-Merge would lead to error. This
would means that file revison is recognized as binary.
> 2) When it happen with one revisions combination does it happen always for that pair?
> Yes. In fact, it seems that it's not the pair that is "corrupted" but only one of the two revision. In my previous example, the revision that can't compare with anyone is 107623
> 3) Can you check if that problem expose also on TSVN on other public repository ?
> I'm not sure to understand this question so I will need more information. In fact, this is on our private repository and it's the first time this is happening in a file history but I can't confirm if it's the only that is doing this...
I was asking if you can find that error in
https://tortoisesvn.googlecode.com/svn/trunk repository log. But this
request is based on expectation that it is bug in TSVN, while as you
have problem with one revision I would focus on that revision of file
(see point 1).

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-14 21:18:24 CET

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