Question

I’ve been unable to find an adequate solution to this problem, so any help would be appreciated. Here is the setup:

1. We have an SVN repo. That repo is also mirrored to a git repo git_svn_mirror.
2. A branch svn_branch was created in the SVN repo.
3. Work was done in svn_branch, including merging up from trunk several times.
4. A new git repo git_from_svn_branch was created from svn_branch.
5. Work was done in git_from_svn_branch.
6. We now need to merge HEAD of svn_trunk into git_from_svn_branch.

Diagram:

[git_svn_mirror] [SVN]                [git_from_svn_branch]
      |  <-mirror  |
      |  <-mirror  |
      |  <-mirror  |-\                        \
      |  <-mirror  | |                        |
      |  <-mirror  |-|                        |
      |  <-mirror  | |  --> (move to git) --> | (kept branch history only)
      |  <-mirror  |                          |
      |  <-mirror  |                          |
      |  <-mirror  |                          |
      |  <-mirror  |                        HEAD    <----
      |  <-mirror  |                                    |
    HEAD         HEAD                                   |
                                                        |
     ^            ^                                     |
     |____________|__ how do we get one of these, into  |__ this (or vice-versa)

Ignoring the issues that caused us to arrive at this situation (“why was a 2nd git repo created”, etc) what is the best solution to the problem?

Answer 1

git remote add git-from-svn-mirror its://repo/url
git fetch git-from-svn-mirror

git merge git-from-svn-mirror/master

should do it.