> PLEASE remember to pull before commiting. This is the 2nd > time I've fixed this. It's a waste of time to keep fixing > the same problems.
Note that this committed winboard.rc is a RENAMED version of jaws.rc. You might have fixed it before in winboard.rc, but you did not fix it in jaws.rc. This has nothing to do with pulling before committing. I don't see how this sort of thing cold be a totally avoided even for normal updates. I cannot commit a version for every character I type, and even if I could I also would not want to pollute the master version with temporary modifications for debugging and experimenting. That would create a huge risk of all kind of crap finding its way in the code because I later forget to remove it. I maintain that risk by doing such experimenting in a fork that I then later (soemtimes mintes later) discard when I am done with the experiment or debugging. But sometimes code originally intended for later removal is kept somewhat longer or even permanently; it is not always clear in advance which branch of the fork will eventually be discarded. Committing both branches would not solve anything, as other people that want to work on the code would not know on which branch they should work. In fact it would invite just the sort of thing you complain about now, where we had committed a JAWS fork so that the resource files were duplicated. In general my commits are obsolete a few minutes after I commit them, as I hardly ever stop working on backend.c and winboard.c for extended periods. And because I commit through Arun they are sometimes even obsolete hours or days BEFORE the are visible in the repository. Pulling such obsolete files is just not an option...
