0

We keep our project's main repository at SVN. Then, to make work easier, each of us did git svn clone SVN's trunk to git's master and we work using git flow. When our work is done within feature branch, we merge it into master and do git svn dcommit to push changes to SVN repository.

But now we need to abandon SVN repository and switch completely to git. How can we achieve it if we want to keep history and branches which haven't merged into master yet?

I thought it that way: we make a clean copy of current SVN repository with git svn clone and place it on our server - it will be our "central" repository. Now, we'll add this repository as remote to our existing repositories. But how can I do it? Can I change old master with the new one? Can I then merge old, not yet merged feature branches to new master without unnecessary conflicts?

Daniel Gadawski
  • 1,893
  • 4
  • 20
  • 32
  • The fact that each developer uses svn-git is irrelevant. Just follow any guide you can find for migrating from SVN to git. – mkasberg Mar 06 '19 at 21:17
  • Possible duplicate of [How do I migrate an SVN repository with history to a new Git repository?](https://stackoverflow.com/questions/79165/how-do-i-migrate-an-svn-repository-with-history-to-a-new-git-repository) – mkasberg Mar 06 '19 at 21:18
  • Well, I guess there are some inticacies about getting in-progress branches ported over. eftshift0's answer is a good one for those concerns. – mkasberg Mar 06 '19 at 21:20

2 Answers2

2

Let's start from the beginning: You should set up a "clean" svn clone on git without any of the private work that the separate developers did. This is so that you can all share the same revisions, otherwise people will have divergent histories that won't be able to get together.... or even worse, multiple revisions on git that actually match a single svn revision.

Then, each one of the developers can use this repo as an official "remote" that they can add to their current set up. Once they have that, they could rebase their private branches at will so that no one loses any of their previous work (I'm not saying this is a trivial thing.... each branch will have a different starting point so if you want to do the work correctly, each branch has to be treated separately.... might even consider using a script that could take care of the analysis of finding matches between the old svn revisions and the new revisions from the new common svn clone) and then you (each developer) can get rid of the original (svn) remote repo that they were using in the beginning so that you can now start interacting with pure git workflows and forget about the svn interactions.

eftshift0
  • 26,375
  • 3
  • 36
  • 60
0

Since you abandon SVN completely you can tell everyone to commit their open feature branches into SVN branches at a certain cut-over date. Then "freeze" SVN, convert it to Git (including the feature branches). After that each developer can clone the new repository and continue work easily.

Since SVN does not matter after the cut-over date the "dirty", half-ready feature branches don't matter any more.

A.H.
  • 63,967
  • 15
  • 92
  • 126