Avatar of omgang
omgangFlag for United States of America

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.

Version Control* source control

Avatar of undefined
Last Comment
Avatar of 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
Avatar of omgang
Flag of United States of America image


@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.
Avatar of pepr

Blurred text
View this solution by signing up for a free trial.
Members can start a 7-Day free trial and enjoy unlimited access to the platform.
See Pricing Options
Start Free Trial
Version Control
Version Control

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.

Top Experts
Get a personalized solution from industry experts
Ask the experts
Read over 600 more reviews


IBM logoIntel logoMicrosoft logoUbisoft logoSAP logo
Qualcomm logoCitrix Systems logoWorkday logoErnst & Young logo
High performer badgeUsers love us badge
LinkedIn logoFacebook logoX logoInstagram logoTikTok logoYouTube logo