git and git-svn and multiple branches and push and fetch

Question

A git svn clone with --stdlayout get me multiple branches if the source SVN repo has multiple branches (and tags).

I want to push all of them to another git repo. The git svn clone did seem to have retrieved all the history for all the versions. Is this a matter of giving better instructions to git push?

Here's my possibly misguided workflow intention.

run git svn to clone svn into a private repo.
push it to a shared repo managed with gitosis
make a shared work branch
various people the gitosis-managed repo, make private branches, and merge into the shared work branch.
I pull from the shared repo back to the one I created in step 1, merge to trunk, and dcommit.

Here's the output of git branch -a after running the git svn clone.

/Users/benson/x/tsk/tsk_git_svn git branch -a
* master
  remotes/origin/master
  remotes/sleuthkit-3.0
  remotes/sleuthkit-3.1
  remotes/tags/sleuthkit-3.0.0
  remotes/tags/sleuthkit-3.0.1
  remotes/tags/sleuthkit-3.1.0
  remotes/tags/sleuthkit-3.1.0b1
  remotes/tags/sleuthkit-3.1.1
  remotes/tags/sleuthkit-3.1.2
  remotes/tags/sleuthkit-3.1.3
  remotes/tags/sleuthkit-3.1.3b1
  remotes/tags/sleuthkit-3.2.0b1
  remotes/tags/sleuthkit-3.2.0b2
  remotes/trunk

score 2 · Accepted Answer · edited May 23 '17 at 12:11

2

you can try a git push --mirror to be sure to push all references from one git repo to another:

from git push:

--mirror

Instead of naming each ref to push, specifies that all refs under refs/ (which includes but is not limited to refs/heads/, refs/remotes/, and refs/tags/) be mirrored to the remote repository.
Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs will be removed from the remote end.

But I would recommend svn2git (if you don't plan to regularly update your svn repo), in order to get actual tags instead of "branches" for tags.

edited May 23 '17 at 12:11

Community

1
1

answered Oct 04 '10 at 15:13

VonC

1,262,500
529
4,410
5,250

thanks very much. Running push --mirror shows signs of pushing it all. But git clone on the resulting repo doesn't show them in the results. – bmargulies Oct 04 '10 at 15:23
@bmargulies: When you `push --mirror` from `gitRepo1` to `gitRepo2`, you should get everything on `Repo2`. But why would you then clone `gitRepo2`? Or did you mean git clone the first repo (the one you should try to `push --mirror`)? – VonC Oct 04 '10 at 15:36
I edited to clarify my perhaps silly plans. I will look at your alternative tool, as well. – bmargulies Oct 04 '10 at 17:21
@bmargulies: the plan looks good (not silly at all ;) ) Except when you will clone the gitosis repo, you won't track all remote branches from the beginning: see http://stackoverflow.com/questions/67699/how-do-i-clone-all-remote-branches-with-git (that is assuming the mysterious '`git clone`' you mention is the one made by the "various people", cloning your gitosis-managed repo) – VonC Oct 04 '10 at 17:31

score 0 · Answer 2 · answered May 12 '12 at 13:32

If you have an access to your SVN server, I would recommend 2 steps solution:

$ subgit install path/to/svn/repository
$ cd path/to/svn/repository
$ git push --all <target Git repository>

Note that the target Git repository should be bare to avoid problems (created by git init --bare command)

git and git-svn and multiple branches and push and fetch

2 Answers2