24-03-2005 07:04									#1
	Stray files under version control Support Apolyton, buy Civilization 2

I was browsing my working copy, and found several files which seem like they shouldn't be there... In particular:

anet.inf
ctp2_program/ctp/anet.inf
ctp2_program/ctp/userkeymap.txt
ctp2_data/english/gamedata/WAW_Great_Library.txt

I'm sure only one anet.inf is necessary, and it should probably be in ctp2_code/ctp, not ctp2_program... (indeed there is one there too, and all three are identical).

Similarly for userkeymap.txt.

WAW_Great_Library raises a slightly subtle issue - since it's the only file from any mod included it seems out of place. I can see that including mod files might be useful, but I think they should be segregated into a seperate directory structure (probably one each). In the long run, of course, we want to reimpliment them as scenarios.

So, is there any convincing reason for any of these files to be where they are?..

	24-03-2005 21:36									#2
	Support Apolyton, buy Civilization III: Complete

userkeymap.txt is not contained in the civmain.ctp archieve on the CD, so I conclude it is a file generated automaticly from the keymap.txt in in ..\ctp2_data\uidata\ and should be therefore deleted.

WAW_Great_Library.txt was added by Fromafar at least it doesn't do any harm like overwriting the key settings of a player, even if the keys are already updated.

The anet.inf is more difficuilt, you don't find int in the civmain.ctp archieve in the ..\ctp2_program\ctp\ folder, either. But you find it on the setup folder of the CD. Probably it came with the patch. But I don't know which one is needed also I tend to the one in the main CTP2 folder over the one in the exe's folder. Maybe the game copies it to that place.

-Martin

	24-03-2005 23:29									#3
	Support Apolyton, buy Civilization 2

quote: Originally posted by Martin Gühmann The anet.inf is more difficuilt, you don't find int in the civmain.ctp archieve in the ..\ctp2_program\ctp\ folder, either. But you find it on the setup folder of the CD. Probably it came with the patch. But I don't know which one is needed also I tend to the one in the main CTP2 folder over the one in the exe's folder. Maybe the game copies it to that place.

Indeed, it did come from the patch files (here). However, there's no such file in my main CTP2 directory, despite the fact that I have applied the patch to it.

	01-04-2005 21:24									#4
	Avatar Enlargement: We've got the solution

The way I have interpreted it, is that the ctp2_program\ctp directory is a (partial) copy of the ctp2_code\ctp directory, containing only the files that are relevant for the end user. Some files (anet.inf, userprofile.txt, map and anet dlls, etc.) are accessed relatively in or from the directory where the executable is located.

Since the archive is centered around the developer (ctp2_code) files, I think we should store the files in the ctp2_code directory tree, and e.g. update the version of anet.inf in the ctp2_code\ctp directory to the patched one.
For release generation, we should create some automatic installer that will copy the relevant files to the ctp2_program tree structure, so we don't have to store the same file at 2 locations.

The files eventcb.txt, ldlparselog.txt, slicdbg.txt, and userprofile.txt are generated from scratch every time or contain personal preferences, so these should not be managed by SVN.

A question for the SVN experts: what will happen when other SVN users do an SVN update after I have done something like: make a local backup, execute SVN delete + commit, restore my local backup as an unmanaged file? Are the files deleted when there are no further conflicts, or are the files kept as unmanaged?
This should not matter too much for the first 3 files, but will matter for userprofile.txt.

	02-04-2005 17:10									#5
	Support Apolyton buy from Amazon

quote: Originally posted by Fromafar The way I have interpreted it, is that the ctp2_program\ctp directory is a (partial) copy of the ctp2_code\ctp directory, containing only the files that are relevant for the end user. [snip] Since the archive is centered around the developer (ctp2_code) files, I think we should store the files in the ctp2_code directory tree, and e.g. update the version of anet.inf in the ctp2_code\ctp directory to the patched one. For release generation, we should create some automatic installer that will copy the relevant files to the ctp2_program tree structure, so we don't have to store the same file at 2 locations.

That's precisely my opinion. I have already created such a script (in the Makefile in the main directory) although it copies to a playtest direcory, not into ctp2_program (to avoid things being cluttered by ".svn" directories). I think we should remove the ctp2_program directory from the repository altogether.

quote: A question for the SVN experts: what will happen when other SVN users do an SVN update after I have done something like: make a local backup, execute SVN delete + commit, restore my local backup as an unmanaged file? Are the files deleted when there are no further conflicts, or are the files kept as unmanaged? This should not matter too much for the first 3 files, but will matter for userprofile.txt.

Well, when I deleted the repository version of ctp2_program/ctp/userprofile.txt, what happened to yours? That is what should happen in such a circumstance. Whether the person who does the deletion happens to restore a local unmanaged copy is irrelevant.