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

Using TortoiseMerge with Delphi forms (ext .dfm)

From: Jack Rew <jack_rew_at_yahoo.fr>
Date: 2006-09-18 16:12:28 CEST

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 ?
Thanks a lot

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Sep 18 17:02:55 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.