asked on

Update dev branches in Subversion

I have Subversion repository with the following structure trunk - production code; branches/PreProdValidation - pre-production; branches/IntegrationTesting - UAT; branches/developerA - developer code branch
The workflow is from branches/developerA to IntegrationTesting to PreProdValidation and eventually to trunk.
I have multiple developers working on the project each with their own repo branch, e.g. branches/developerA, branches/developerB, etc.

This is working fine except keeping the developer branches up to date with changes going into IntegrationTesting. Looking for recommendations on how to merge, or update, the developer branches with changes in IntegrationTesting, e.g. changes made by the other developers. I thought a standard merge from IntegrationTesing back into their respective branch would work but I receive errors regarding re-integration.

Suggestions?

pepr

You may want to hear something else, but my suggestion is to switch from Subversion to Git.

You can find here how to migrate https://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git

Here you can find inspiration on what workflow may be the most suitable for you https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows

omgang

ASKER

@pepr, I appreciate the recommendation but am hoping for some insight into my current situation, at least initially. It is ironic that my organization spent ~one year on researching, planning and preparing for the implementation of source code version control using Subversion only to have our parent organization switch to Git during the same month we went live with Subversion. There has been a learning curve and growing pains for all now that version control has been implemented. Perhaps after some time becoming acclimated we will consider the move to Git.

Thanks again.

ASKER CERTIFIED SOLUTION

pepr

membership

This solution is only available to members.

To access this solution, you must be a member of Experts Exchange.

Start Free Trial