How is development going?

[Chris H.]

Ah, thank you.

I remember reading somewhere a reference to setting a SVN password. I also found a page on google profile -> settings with a googlecode password.

[frwololo]

The SVN works as advertised, but I'm still concerned that by the time I'm finished revising a major section of CardFactory, that it might screw up the merge when I commit it. I don't know enough about it to trust it implicitly yet. The change I submitted took me all of only one hour to implement, so I wasn't worried. But my latest change is going into the second week....

The problem of course exists. Most of the time, SVN is clever enough to tell you that your change is incompatible with another change that happened while your were working. Sometimes it will merge both changes without realizing it's making a mistake (this is when both changes look "compatible" from a text point of view, but are not from a program logic point of view...for example if you're using a variable that has been removed by someone else in a parallel change)

As Forge suggested, a good practice is to submit your changes as often as possible, as long as they are "atomic", i.e. you don't submit broken code, but you can try to split your project into several small subprojects that are independent. This is also good for organizing the way you code as well, as it forces you to stay organized.

It is also a good practice to make sure the code still works after a merge, before you submit your changes.