I have this kind of situation:
CVS trunk - all changes, stable ad unstable, are made to trunk.
production - major releases are made creating tags on CVS, but minor fixes are made manually, merging only the requested changes from trunk.
I'm not allowed to use branches, so I need an alternative solution to simplify or automate the process, because right now the risk of errors is too high.
Can anyone help me? Thanks!