1

Need some help with svn to git/ git to git migration with history.

The old svn repo was migrated to git (with history). This git repo, now old, was then copied to a newer git repo location, but unfortunately without preserving any history from the inital svn to git migration).

Since then, there have been changes to the svn repo as well as the old git repo. The master branch of the new git repo is protected

I would like to do either of the following, which ever is easier:

  1. Migrate all the new changes from the old git repo to the new git repo with ALL the history (including the history from the initial svn to git migration.) OR
  2. Migrate the new svn changes to the new git repo, WITH all the svn history. I can then copy over or manually add the new old git repo changes to the new git repo.

Thanks!

EDIT: Adding more clarification or details:

  • The old_git_repo was copied over to a new_git_repo but without preserving its history.
  • Additionally, there were changes made to the old_git_repo which now need to migrated over to the new_git_repo as well.
  • The migration should include all the history of the old_git_repo, that was missed with the initial migration to new_git_repo, and also the new changes made in the old_git_repo

Will the below work?

  1. In my new_git_repo, I will create a new branch migrate_old_git_to_new_git
  2. Run git clone --mirror git_repo_dir (will this work?)

Will step#2 get all the current changes to the old_git_repo including the history? If yes, then I should be able to create the MR and merge/ overwrite with history and new changes? Thanks!

Do I need to create a new branch like in step 1 or can I do the clone --mirror on master?

user1971376
  • 93
  • 1
  • 4
  • 10
  • Regarding this: "Since then, there have been changes to the svn repo as well as the old git repo." Are the changes in svn and the old Git repo the same changes, just duplicated in both places? If yes, then the second sentence of option 2 shouldn't be necessary. If no, then option 1 would lose the new changes in svn. (Am I interpreting this correctly?) – TTT Jan 23 '23 at 05:06
  • @TTT Yes the changes are different. Ideally I would like to do step #1, restore all of the history from the old git repo and also include new changes made in the old repo, using git commands... and then I can make the svn changes manually on this branch. If I create a branch and run `git clone --mirror git_repo_dir` will it work? – user1971376 Jan 23 '23 at 05:30
  • I'm not seeing anywhere that the new Git repo has its own changes that are needed, so you could just blow away the new Git repo and replace it with the old Git repo, which, by the way, is the same thing as just putting the old Git repo in two different places. (What is the purpose of the new Git repo anyway?) It might be simpler to decide which repo will be the source of truth moving forward, and set the other ones to read only so you don't have this problem again. – TTT Jan 23 '23 at 15:27
  • Not exactly what you asked but this might help. https://stackoverflow.com/questions/76502989/update-old-git-repo-from-subversion – parsley72 Jun 19 '23 at 00:26

0 Answers0