Re: How to clone git repository with git-svn meta-data included?
From: Grzegorz Kossakowski <hidden>
Date: 2016-06-15 22:45:44
Michael J Gruber pisze:
Could it be as simple as a missing "cd cocoon" between git clone and git svn rebase? No, you probably did that.
That would be too easy.
But note that you did not follow Peter's instructions. The point is that your clone creates "remotes/origin/trunk" whereas Peter's instructions mirror the source, creating "remotes/trunk", which is what git svn needs (unless you say "git svn init -s --prefix=origin/" or "git config svn-remote.svn.fetch trunk:refs/trunk" etc.). The prefix solution should be the best. Michael P.S.: Peter starts off a different layout (standard svn remotes, which need special instructions to be cloned). Ordinary clone + git svn init --prefix=origin/ should work fine for the cocoon layout.
This almost worked. Actually, Cocoon repository hosted on Jukka's server does not have local head named "trunk" so there is no remotes/origin/trunk created during cloning process. I had to run: git update-ref refs/remotes/origin/trunk refs/heads/master After doing that git svn rebase resulted in: [really long list of revisions] r707379 = f61a2d30b6ac5a5136b46fa2b9b5b91e4763feb1 r710118 = 40997fe552e8581b75b08fed41a6b63a33d58bdf r720135 = a8160766ec40fd7ebf95bfa7cebfa50dfa2f9c3a r720180 = b094a222bab3671c8277087e7a96589ec76dd5e4 r720182 = 736b8ed6519c64ad120de2ccf08f135062ee09db Done rebuilding .git/svn/origin/trunk/.rev_map.13f79535-47bb-0310-9956-ffa450edef68 Current branch master is up to date. Is this expected output?
P.P.S.: We can't test cocoon unless we have an account on the apache server...
I guess this would be a big problem. Getting write-access access to our repository is rather formal process and I would like to avoid it. Since it looks I'm much closer to final solution (and better understanding of how our workflow should look like) I hope any additional account for testing won't be needed. Anyway, thanks again for your answer! -- Best regards, Grzegorz Kossakowski