Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / fpc-devel / 2015-05

git mirror

2 messages · 2 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Jonas Maebe
to Edmund Grimley Evans

Edmund Grimley Evans wrote on Fri, 29 May 2015:

https://github.com/fpc-svn/fpc.git seems to have stopped updating itself. Does anyone know how to edit a .git/config so that a clone of that git repo can be updated with git-svn, without starting again from r1?

I think this should work, based on what they explain in the article you linked:
1) add the following to your .git/config

[svn-remote "svn"]
url = http://svn.freepascal.org/svn/fpc
fetch = trunk-gitsvn:refs/remotes/trunk

2) git svn fetch -r <last_revision_you_have>:HEAD

and then to link your old and new history:
1) get the commit hash of the first/oldest commit in this trunk-gitsvn branch ("hash-gitsvn-start")
2) get the commit hash of the last commit in your github mirror ("hash-git-end")
3) both of those should be for the same svn revision, but will obviously have a different hash. Now glue both together in the trunk-svn branch:
git replace hash-gitsvn-start hash-git-end

Jonas

Reply by email