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

Re : Using TortoiseMerge with Delphi forms (ext .dfm)

From: <jackrew2000-antispam_at_yahoo.fr>
Date: 2006-09-19 13:18:35 CEST

Hi Bern,
 
You are right. It is exacly the case. Some are text (the ones I can open), and some are binary. Is it possible to change settings to get only text files? Is there other possibilities?
 
Thanks
 
Laurent
 
 

----- Message d'origine ----
De : Bernd Kuhlmann <bernd.kuhlmann1@ewetel.net>
À : users@tortoisesvn.tigris.org
Envoyé le : Lundi, 18 Septembre 2006, 6h30mn 14s
Objet : Re: Using TortoiseMerge with Delphi forms (ext .dfm)

Am Montag, 18. September 2006 16:12 schrieb Jack Rew:
> I am developping with Delphi, and I have conflicts between 2 versions. I
> can solve them one by one using Tortoise Merge, but I have a serious
> problem with Delphi forms (extension .dfm): In some case everything goes as
> normal and I can modify, and in some cases I have the message: "The file
> is not a valid text file! Not that UTF16 and UTF32 are treated as binary
> too".
>
> Why does it work in some cases and not in others? How to identify the
> problem? How to solve it ?
>
Delphi can save forms as a text file or in an internal binary format.
If you open the dfm file with a text editor, do you see text or binary data?

Bernd

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Sep 19 13:18:44 2006

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