Trouble merging tests from branch
We regularly develop and test multiple versions of our products, using multiple branches in our source control system (in our case, Subversion). Naturally, the soapUI test sources (project files, etc.) travel with the sources for the system-under-test. In other words, we may have multiple versions of test project files -- for example, one on the mainline trunk, another on the release branch, another on a future feature branch, etc. Of course, a test definition may be different on different branches, depending on changes in the system-under-test.
We routinely need to merge changes between branches. For example, to merge changes on a release branch back to trunk. Or to merge changes to the trunk version back to a feature branch. But this has proven difficult with the soapUI XML files. These files contain various tool metadata values (e.g. UUIDs) that produce merge conflicts. A manual resolution is required, and it's a lot of work to carefully tweeze out the diffs that should be merged from metadata changes that *must not* be merged. All in all, a painful and error-prone task that is playing hell with our build process.
Isn't there a better way?
We routinely need to merge changes between branches. For example, to merge changes on a release branch back to trunk. Or to merge changes to the trunk version back to a feature branch. But this has proven difficult with the soapUI XML files. These files contain various tool metadata values (e.g. UUIDs) that produce merge conflicts. A manual resolution is required, and it's a lot of work to carefully tweeze out the diffs that should be merged from metadata changes that *must not* be merged. All in all, a painful and error-prone task that is playing hell with our build process.
Isn't there a better way?
