Executing test scripts on different servers

Agreed. That's how my project is set up. Configuration stuff like test environment details are stored in the project suite variables. We have a development version of the project suite that test development is done in and then a staging version where the new and updated scripts get merged into. It's a bit of a hack as we have 2 versions of the project suite pj's file (holds project suite vars) but it works. Yes, they should really be moved out into a configuration file! How well this would work with keyword tests I don't know. I suspect there are things like the namemapping file that won't play well with source control. So, in principle having two versions of your project is valid once you move out any configuration and test environment specific stuff into variables or config files. You just have to do a lot of tricky work with figuring out which files should merge, be overwritten etc.