We are getting a multi-developer project off the ground and are using subversion for source control. We are using subversion in the most basic way, mostly just using the Tortoise SVN client, v1.8.5 which is the latest and using it through Windows Explorer.
The trouble we've been having is merging changes into the .uvoptx file. It seems that making the smallest change to the project like adding a new source file cause many changes to the .uvoptx file and when another developer updates to those changes it cause many conflicts.
We tried removing the .uvoptx file from the files saved in subversion and each developer just keeps a local copy of it. I think this is a bad idea because then the .uvprojx and .uvoptx file are not in lockstep and bad things seem to happen but I'm not sure of that.
So, my two questions are:
1) If I change the .uvprojx file and give it to another developer without the changed .uvoptx file should I expect bad things to happen? 2) Is there a way to not make so many changes to the .uvoptx file. For example, it seems to save things like what file was open for editing or what folders were open in the project window which doesn't really matter.
Thanks.
Mike
I cheat a bit with the project file.
There is a copy in the respository.
People don't commit any project file.
Then when new files needs to be added - or new options changed - then I - throw away my file - retrieve the repository version - just exactly add files/changes options - commits this changed file (which now doesn't get so much noise changes from current cursor position, window open order etc that Keil pollutes the project with)
The project file just contains too much noise that shouldn't have been in that file.
Thank you for your advice. That may be what we need to do. Do you do the same thing with the option file? It's kind of a pain when we are early in the project and everyone on the team is wanting to change files and options in the project but that should settle down pretty quickly.
Yes, the project files get polluted with a lot of noise, I like your terminology.
It seems like it would have made more sense to put the info about cursor postion and things like that in the gui files which are individualized for each user.
Yes, there should have been total separation.
The project file should have been 100% focused on the rules required to perform the similar task of a Makefile. Everything else should have been optional information stored in separate files that doesn't need to be version-controlled and that can be auto-created if missing.