Git Svn Bridge Info
- Anthony Thornton
Now fully understand the problem create the git-svn bridge for MercuryDPM. It is commit 709 and 710. In these commits we changed the naming convention from trunk->Trunk alpha->Alpha etc.
Now git svn clone can not follow the moving of existing branch. It simple was not designed to do this.
Conclusion:
- Only git the trunk,
- Alpha/Release/.. will be accessible only via svn,
- Trunk commits only via git, via push-requests (to be confirmed by Irana, Anthony or Thomas)
- Branches on central server
Have played with a lot options. I (Anthony Thornton) personally think the best long term solution is to run bit bucket server with SVN Mirror for Stash Bitbucket add-on. This current cannot be done in the bit bucket cloud so we would have to set it up on our own servers.
Linus Torvalds is an interesting guy. The advance git-svn options are hided you cannot even access them with one million flags. You have to manual edit a text file. On this note the file: ./git/config store some interesting information under svn-remote tag.
DO NOT run the command below. This is a temp note for Anthony Thornton
git svn clone https://svn.mercurydpm.org/SourceCode/ -r 711 -T trunk -b Branches -b Alpha -b Beta -t Release --no-follow-parent -log-window-size=1000000 --ignore-path='Obsolete' <YourLocalName>
| Version | Date | Size | Command |
|---|---|---|---|
| 174 | 2011-02-24 10:19:03 | 1.1GB | git svn clone https://svn.mercurydpm.org/SourceCode/ -T Trunk -r 1:HEAD --log-window-size=100000000 --ignore-path='Obsolete' --authors-file authors.txt MercuryGit |
2716 | 2018-04-09 18:56:12 | 261M | git svn clone https://svn.mercurydpm.org/SourceCode/ -T Trunk -r 1:HEAD --log-window-size=100000000 --ignore-path='Obsolete' --no-follow-parent --authors-file authors.txt MercuryGit |
Merging procedure
- Spin up amazon server
git svn fetch
- git pull
git merge origin/trunk
git push -u Bitbucket
- (optional - send code back) git dcommit