From: Grzegorz Kossakowski <grek@tuffmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>, git@vger.kernel.org
Subject: Re: How to clone git repository with git-svn meta-data included?
Date: Mon, 08 Dec 2008 19:26:03 +0100 [thread overview]
Message-ID: <493D66BB.3060907@tuffmail.com> (raw)
In-Reply-To: <493D1CC2.8050407@drmicha.warpmail.net>
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
next prev parent reply other threads:[~2008-12-08 18:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-06 12:15 How to clone git repository with git-svn meta-data included? Grzegorz Kossakowski
2008-12-07 8:43 ` Jacob Helwig
2008-12-08 0:03 ` Nick Andrew
2008-12-07 16:57 ` Peter Harris
2008-12-07 19:08 ` Grzegorz Kossakowski
2008-12-07 20:30 ` Peter Harris
2008-12-07 22:02 ` Grzegorz Kossakowski
2008-12-07 23:51 ` Peter Harris
2008-12-08 13:10 ` Michael J Gruber
2008-12-08 18:26 ` Grzegorz Kossakowski [this message]
2008-12-08 18:40 ` Peter Harris
2008-12-08 18:43 ` Grzegorz Kossakowski
2008-12-09 9:08 ` Sam Vilain
2008-12-09 20:57 ` Grzegorz Kossakowski
2008-12-09 8:53 ` Michael J Gruber
2008-12-08 16:10 ` Shawn O. Pearce
2008-12-08 19:04 ` Grzegorz Kossakowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=493D66BB.3060907@tuffmail.com \
--to=grek@tuffmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.