[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: Carsten Johnsen <cjo_at_kirktelecom.com>
Date: 2006-09-18 20:28:19 CEST

"Bernd Kuhlmann" wrote
> 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?

In the Delphi bin-folder (at least in Delphi7) there is a program called
convert.exe which will convert any binary dfm-file to text-format. The only
thing left for you to do is to manually delete the property svn:mime-type on
the converted files before committing, and you will be able to open your
.dfm-files with TMerge in the future.

I've done this myself and it works perfectly.

/Carsten

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

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