Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

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

Tags:

git

git-svn

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.

  1. run git svn to clone svn into a private repo.
  2. push it to a shared repo managed with gitosis
  3. make a shared work branch
  4. various people the gitosis-managed repo, make private branches, and merge into the shared work branch.
  5. 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
like image 878
bmargulies Avatar asked Jan 28 '26 20:01

bmargulies


1 Answers

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.

like image 185
VonC Avatar answered Jan 30 '26 10:01

VonC



Donate For Us

If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!