Restructuring SVN when you already have branches / tags

I have a project with a structure like this:

project
  code
  art
  config

Art exceeds 1 GB and can cause pain when switching branches, plus developers do not need it. So I want to move it to a separate top-level project project-art. It's fine in the trunk, but I already have some branches that are actively working ... so the actual current setup is more like:

project
  trunk
    code
    art
    config
  branches
    branch123
      code
      art
      config

How can I transfer art from a conceptual structure without twisting it when the branches merge again?

- project/trunk --- > project-art/trunk, , . , , , ?

+3
3

, , , , , . , , .

+1

, - . Subversion ( ) .

  • svn://repo/project/branches/branch123/art svn://repo/project-art

  1. svn://repo/project/branches/branch123/ svn://repo/project/code
  2. svn://repo/project/branches/branch123/ svn://repo/project/config

- / --- > -/, , .

, , , , . , , .

, , ?

. , .

0

If the "art" subdirectory is not changed in any of the branches, you do not have to worry about merges. Just go and move the "art" to a new place. Branches merge back into the trunk without conflict, because they have no changes in the "art".

0
source

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


All Articles