Skip to content

[z git svn] Working with git svn fetching the svn commits

Jump to bottom
Utumno edited this page Feb 27, 2014 · 1 revision

You have to set up the git svn bridge. Should be as simple as cloning this repo and adding to the .git/config:

[svn-remote "svn"]
	ignore-paths = ^(?:Releases|Projects|Scripts|Games|)/|^Programs/(?:Nif Scanner|Nif Viewer|Raziel23x's Oblivion Toolset|Shader Disasm|Shader Editor)/
	url = svn://svn.code.sf.net/p/oblivionworks/code
	fetch = Programs/Wrye Bash:refs/remotes/svn/trunk
	branches = Branches/Wrye Bash/*:refs/remotes/svn/*
	tags = Tags/Wrye Bash/*:refs/remotes/svn/tags/*
[svn]
	authorsfile = authors_with_emails.txt

But I am not sure it is as simple as this. Till I find out I will probably have to update it myself

git svn fetch - on master branch

MrD@MRSD /c/Dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$  git svn fetch
Can't open authors_with_emails.txt No such file or directory

you'll need authors_with_emails.txt 

$  git svn fetch
M       Programs/Wrye Bash/Mopy/bash/bosh.py
# ...
Network connection closed unexpectedly: Connection closed unexpectedly at /usr/lib/perl5/site_perl/Git/SVN.pm line 148

MrD@MRSD /c/Dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git svn fetch
Index mismatch: 8a5491d4974667437292b815e0c9bf409ad92d9e != 762a7ff0784845b9dbd2c8ea959c8ff92b5d9e7c
rereading dbac09ecc9b3bb0d0bdf7f11adfef6cea36447cf
		M       Mopy/bash/game/skyrim.py
r3092 = 099b7444cbdb8a0b91b10d55967a5a1b72c26a95 (refs/remotes/svn/dev-sharlikran)
		M       Mopy/bash/game/skyrim.py
Author: avorum not defined in authors_with_emails.txt file

had to add them manually to authors_with_emails.txt

MrD@MRSD /c/Dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git svn rebase
fatal: unable to access '../../../../../c:/Dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB/.git/config': Invalid argum
ent
fatal: index file open failed: Invalid argument
Cannot rebase: You have unstaged changes.
Please commit or stash them.
rebase refs/remotes/svn/trunk: command returned error: 1

this was a bug in git 1.8.4 - had to update to 1.8.5

Welcome to Git (version 1.8.5.2-preview20131230)

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git remote add origin https://github.com/Utumno/wrye_bash_refactoring.git

whereupon I run across another bug in 1.8.5 this time 

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git push -u origin master
fatal: could not read Username for 'https://github.com': No such file or directory

so I set ssh up

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ ssh -T git@github.com
Warning: Permanently added the RSA host key for IP address '192.69.69.129' to the list of known hosts.
Hi Utumno! You've successfully authenticated, but GitHub does not provide shell access.

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git remote rm origin

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git remote add origin git@github.com:Utumno/wrye_bash_refactoring.git

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git push -u -n origin master
Warning: Permanently added the RSA host key for IP address '192.69.69.128' to the list of known hosts.
To git@github.com:Utumno/wrye_bash_refactoring.git
   724dfd6..9c20f91  master -> master
Would set upstream of 'master' to 'master' of 'origin'

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git push -u -v origin master
Pushing to git@github.com:Utumno/wrye_bash_refactoring.git
Warning: Permanently added the RSA host key for IP address '192.69.69.131' to the list of known hosts.
Counting objects: 215, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (120/120), done.
Writing objects: 100% (121/121), 441.94 KiB | 0 bytes/s, done.
Total 121 (delta 99), reused 0 (delta 0)
To git@github.com:Utumno/wrye_bash_refactoring.git
   724dfd6..9c20f91  master -> master
Branch master set up to track remote branch master from origin.
updating local tracking ref 'refs/remotes/origin/master'

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git svn rebase
Current branch master is up to date.

great - now the other branch !

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (master)
$ git checkout dev-sharlikran
Checking out files: 100% (910/910), done.
Switched to branch 'dev-sharlikran'

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (dev-sharlikran)
$ git svn rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded dev-sharlikran to refs/remotes/svn/dev-sharlikran.

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (dev-sharlikran)
$ git push -u -n origin dev-sharlikran
To git@github.com:Utumno/wrye_bash_refactoring.git
   7ca250c..c95e754  dev-sharlikran -> dev-sharlikran
Would set upstream of 'dev-sharlikran' to 'dev-sharlikran' of 'origin'

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (dev-sharlikran)
$ git push -u -v origin dev-sharlikran
Pushing to git@github.com:Utumno/wrye_bash_refactoring.git
Counting objects: 381, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (186/186), done.
Writing objects: 100% (193/193), 445.46 KiB | 0 bytes/s, done.
Total 193 (delta 155), reused 2 (delta 2)
To git@github.com:Utumno/wrye_bash_refactoring.git
   7ca250c..c95e754  dev-sharlikran -> dev-sharlikran
Branch dev-sharlikran set up to track remote branch dev-sharlikran from origin.
updating local tracking ref 'refs/remotes/origin/dev-sharlikran'

MrD@MRSD /c/dropbox/eclipse_workspaces/git-svn-wb~/git_svn_WB (dev-sharlikran)
$ git checkout master
Clone this wiki locally