Databases
StackOverflow2013
Postsdbo
POHow can I import SVN with inconsistent branching structure into Git?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow can I import SVN with inconsistent branching structure into Git?
    primarykey
    data
    text
    <p>I apologize if this question has been asked before, but my case is a relatively specific one. I have been at my company for some time and using SVN, but desired recently to move to Git, for various reasons.</p> <p>The issue I'm having right now is that my company uses a non-standard branching structure, and unfortunately, at times in the past, it hasn't even been a consistent non-standard branching structure.</p> <p>The history I'm aware of, since joining the company, is that we use one main trunk branch, from which we create release branches and feature branches. The structure of these branches isn't simply a standard trunk/branches/tags structure, however. We have several subfolders for different types of branches. For instance, release branches go in branches_release, feature branches in branches_feature, etc, like the following:</p> <pre><code>branches_feature/featureA branches_release/2.0 </code></pre> <p>I figured out how to make this clone/fetch work properly by modifying the Git repo's config so that</p> <pre><code>branches = {branches_feature,branches_release}/*:refs/remotes/branches/* </code></pre> <p>This has been relatively successful in fetching the appropriate branches. The one issue I'm having is that when my company first started, it used a structure more like:</p> <pre><code>branches_feature/username/branchname </code></pre> <p>Unfortunately to find this out (the hard way) I had to "git svn fetch" and find that all of these branches following the older branching convention have been collapsed so that in Git each user has a single branch in which exists every branch made. So,</p> <pre><code>branches_feature/username/featureA branches_feature/username/featureB </code></pre> <p>have been collapsed into:</p> <pre><code>branches_feature/username </code></pre> <p>Obviously this is insufficient for a properly reproduced SVN repo history, but I'm not sure how to modify the config's branches line to encapsulate all of these branches AND still use the new branching format properly. I've been trying to manipulate it in various ways, but I wind up either getting errors or simply being unsuccessful in my attempts.</p> <p>If anyone can suggest a good way to appropriately preserve the SVN repo's history while importing from SVN to Git, I would greatly appreciate it.</p> <p>Thanks.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USMatt D
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow can I import SVN with inconsistent branching structure into Git?
      1. USMatt D
      1. VTFavorite
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload