[Hajo]

Hi,

when I started Sonnheim, my tile list files were desigend as binary files. Thus I checked them into the CVS repository marked as binaries (non-mergable).

I changed my mind on that. Particularly if more people join the project, it will be handy if tile list files can be merged. At least if people do not edit the same tile at the same time this will work with the new text-based format.

Now I feel uncertain what to do ... will it work to check in the new text files with the same name as the former binary file and use cvs admin to change the file type? Or is it better to delete the old files and check in newly? The latter means to loose the file change history, though, with CVS, because it won't identify them as the same file anymore after deleting the old one.

Suggestions?

[DeveloperX]

What if your engine could use both text and binary?

Create a tool to convert from one to the other too.

Then you could use a different extension for each, and upload the new text files without worrying about conflicts.

Create a common interface to deal with both types in the engine.

This makes it extensible and easier to maintain, and also the conversion tool would allow you to build binary versions for final release.
_________________
Principal Software Architect
Rambling Indie Games, LLC

See my professional portfolio

[Hajo]

Currently it's made so that the loader detects the type and uses the correct codec for each format. It's needed for compatibility reasons anyways.

Changing the file extension means to lose the change log for that file in the CVS. CVS unfortunately cannot rename files, and the trick to edit the files in the repository itself does not work since I do not have the rights to do that on the machine where the repository is located.

From a pragmatic view I assume I should not care too much about the change log, just delete the old file, and check in the new one without the "binary" flag. With the right tools people can still see the change log for the deleted file ... who looks at the logs but a developer? And those should know how handle this.

[Rainer Deyke]

One word: cvs2svn.