feedreader-development

[Feedreader-development] DFM files

[Kyle C. <ky...@ky...>]

It looks like the DFM files are (correctly) stored as Text DFMs, but are
(incorrectly) marked in CVS as Binary.

That's a bad thing, it will make CVS handle merges poorly.

[ Kyle Cordes * ky...@ky... * http://kylecordes.com ]
[ Consulting, Training, and Software development tips and   ]
[ techniques: Java, Delphi, ASTA, BDE Alternatives Guide,   ]
[ JB Open Tools, EJB, Web applications, methodologies, etc. ]

[Feedreader-development] DFM files

[Kyle C. <ky...@ky...>]

I think I posted a few days ago, about the DFM files being marked binary in
CVS, making it not merge.

This bit me today; I had made some tweaks to the DFM here, but CVS would not
merge them with the incoming changes from the updated file in CVS.


[ Kyle Cordes * ky...@ky... * http://kylecordes.com ]
[ Consulting, Training, and Software development tips and   ]
[ techniques: Java, Delphi, ASTA, BDE Alternatives Guide,   ]
[ JB Open Tools, EJB, Web applications, methodologies, etc. ]