commit philosophy

Hi Robbie,

wow, I'm very impressed by your last commits. Unfortunately I currently do not have much time for testing and developing, but will investigate some more in the next weeks.

With such huge commits it is nearly impossible for me to keep a separate branch up to date with the trunk. Doing the merge process in this case is a pain in the a*.

As far as I can see most of my changes are included in your last commits, but I'm not sure how you merge the code into the trunk.
Did you use the svn merge command?

So, for now I decided to kill my branch, an wait for input from your side.
What do you think is the best way to proceed in the future?

Regards

Re: commit philosophy

Ramses,

yes, that’s right. There were many changes commited last weekend. Especially the templating system has been redesigned and meets now more user expectations (dependent on requests).

All the time I made changes to the code I thought about you and how difficult it will become to merge the trunk with your brunch. I’m sorry for this.

Until now the strategy has been “commit as soon as possible”. I was the only developer so far and it wasn’t a problem yet. Therefore it was possible, that there were one, two… bugfixes and/or new features, or just only one minimal change concerning one line of code in one commit.

I merged the code manually. I know, it’s not really efficient, but as I can remember, I had problems on merging with svn merge command. Maybe it was my fault?!

I think about a solid solution and will edit this post soon.

Robbie