From: John Locke <mail@freelock.com>
To: Michael J Gruber <michaeljgruber+gmane@fastmail.fm>
Cc: git@vger.kernel.org
Subject: Re: git svn clone a non-standard repository
Date: Thu, 26 Jun 2008 11:39:29 -0700 [thread overview]
Message-ID: <4863E261.8040508@freelock.com> (raw)
In-Reply-To: <4863E01E.9050108@freelock.com>
Sorry to respond to my own post, but this section looks wrong:
John Locke wrote:
>
>
> Now the tricky part: I checked out a new "work" branch, and deleted
> everything in the working copy. Then, 4 steps out of the howto,
> adjusted to pull the particular branch from the current repository
> (instead of an outside one):
>
> git remote add -t dojo -f dojo ./
> git merge -s ours --no-commit dojo-trunk
> git read-tree --prefix=dojo/ -u dojo-trunk
> git commit -m "merge dojo into subdirectory"
... since I added the remotes as svn-remote sections directly in
git-config, I skipped that first line.
I'm going to write this all up on my blog when I get it working correctly...
Cheers,
--
John Locke
"Open Source Solutions for Small Business Problems"
published by Charles River Media, June 2004
http://www.freelock.com
next prev parent reply other threads:[~2008-06-26 18:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 18:32 git svn clone a non-standard repository John Locke
2008-06-25 15:25 ` Michael J Gruber
2008-06-26 18:29 ` John Locke
2008-06-26 18:39 ` John Locke [this message]
2008-06-27 1:06 ` John Locke
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=4863E261.8040508@freelock.com \
--to=mail@freelock.com \
--cc=git@vger.kernel.org \
--cc=michaeljgruber+gmane@fastmail.fm \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).