How to specify overlapping rules in git-svn

I need to get revisions from SVN to GIT. I have two types of branches under SVN:

  • Standard branches located in the folder / branches under SVN
  • Some specific branches located under / branch / devs / folders

To get both types of branches, I specified the following configuration in the svn-remote section:

[svn-remote "svn"] url = https://somecompany.com/product fetch = trunk:refs/remotes/trunk fetch = tools:refs/remotes/root/tools branches = branches/*:refs/remotes/* branches = branches/devs/*/*:refs/remotes/devs/*/* tags = tags/*:refs/remotes/tags/* 

Unfortunately, for the second type of branches, sampling is performed twice. Turning to developers as a regular branch, and the second time in the right direction: work with individual branches of developers.

Until now, I have manually commented on either the first or second β€œbranches” and indicate which revisions are retrieved based on which branches were affected by the commits.

Can anyone suggest a way to automate (fix) the above?

Thanks,

Gray y

+4
source share
1 answer

First, you need to specify a more specific one, because some part of the code (including git-svn branch ) looks for them in order. The problem you are facing is that internally fetch_all just merges them all. It is impossible to write this at a time when double sampling would be avoided.

+3
source

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


All Articles