Dear all,
Thanks a lot for your answers.
It seems that in some cases that I could not identified, some dfm files are saved in a binary format, EVEN IF the Delphi settings where set to " New form as text" (at least for Delphi6 in my case).
The solution is to use the convert.exe programme which is in the bin folder of Delphi. (syntax: 'convert.exe Form.dfm' DOS only). In my case I copied convert.exe in my working folder to avoid to move the files to bin, and as DOS doesn't like 'space' in the path.
Once the file is converted (Form.txt), I just replaced the old file and renamed the form.txt to form.dfm.
It seems that from that moment, Delphi keeps the text format, even on future changes.
Have fun with Tortoise, and have a nice day
Laurent
----- Message d'origine ----
De : Keith.miller <keith_miller@ntlworld.com>
Ŕ : users@tortoisesvn.tigris.org
Envoyé le : Mercredi, 20 Septembre 2006, 9h28mn 08s
Objet : Re: Re : Using TortoiseMerge with Delphi forms (ext .dfm)
Milen A. Radev wrote:
> On 19/09/06, jackrew2000-antispam@yahoo.fr
> <jackrew2000-antispam@yahoo.fr> wrote:
> [...]
>
>> 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?
>
>
>
> A co-worker told me there is an option in Delphi's global settings
> (Delphi 2005 at least) - it's in "Enviromental Setting -> Delphi
> Settings -> VCL Designer -> New forms as text".
>
Delphi 6 as well...
---------------------------------------------------------------------
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 Wed Sep 20 10:58:07 2006