All geek questions in one place

SVN Combining various projects into one master project

Our 24 development team uses Tortoise svn for windows and the command line for Ubuntu. We started with one main folder in SVN. But we encountered some conflicts and problems in QA releases and decided to have three more instances of the wizard, namely Alpha, Beta and Gamma. The Alpha command will always be attached to the Alpha folder. Team Beta will always be in beta, etc.

Folder structure:

Before

  • Master

After

  • Master
  • Alpha
  • Beta li>
  • Gamma

The problem we have now is file merging, because 3 teams work in different modules, and sometimes in ordinary files. When we try to merge files from Alpha, the newly added Beta files disappear from the wizard.

What approach should be used to merge changes from Alpha, Beta and Gamma to the Master before releasing the Master to QA ?

+4
source share
1 answer

Your “Master” folder should be considered as a “connecting line” from the classic SVN Red Book layout ( http://svnbook.red-bean.com/en/1.2/svn.branchmerge.maint.html ). Alpha, Beta and Gamma are branches, according to the same link.

Each “milestone” from Alpha, Beta or Gamma must be reintegrated into the Master (see here: http://technology.amis.nl/2010/02/25/subversion-branching-merging- and-reintegration ). There, other teams will have to combine a number of changes in their copies ( http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html , see Cherrypicking).

In TortoiseSVN, these operations are in the Merge command (TortoiseSVN> Merge in the target directory).

0
source

Source: https://habr.com/ru/post/1490029/

More articles:


All Articles