From: Junio C Hamano <gitster@pobox.com>
To: Gregory Jefferis <jefferis@gmail.com>
Cc: Charles Bailey <charles@hashpling.org>,
Dmitry Potapov <dpotapov@gmail.com>, <git@vger.kernel.org>
Subject: Re: Stitching together private svn repo and public git repo
Date: Thu, 03 Jan 2008 09:24:31 -0800 [thread overview]
Message-ID: <7vd4sistyo.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <C3A2A4FD.1089D%jefferis@gmail.com> (Gregory Jefferis's message of "Thu, 03 Jan 2008 14:43:09 +0000")
I suspect your message was linewrapped by your MUA and ...
Gregory Jefferis <jefferis@gmail.com> writes:
> ...
> # set up the grafts
> cat > .git/info/grafts <<EOF
> # connect r2 of git-svn to v1.86 of nm-ucl
> # r1 (which was an identical initial import) will now be detached (and
> forgotten)
> 52b1933421ef524811407fa4c240da58ceec5749
> eca3db14fcf25744fdf585456f03599a9db2af96
> #
> # Make fake merge with Neuromatic v1.91b
> # svn-manualmerge1 svn-manualmerge1~1 public-v1.91b
> 120282ee5275027312dde386c8995218f361cf35
> 0962cb27f7ad92f44def04630e8e6a22b86e0699
> 6735057f53dd57248c7ec23f6ae9f22085d98fba
> EOF
>
> # running git-status seems to stop git thinking that the working dir is
> dirty
> git-status
> ...
... your grafts file look as if you are marking five commits as
root commits, which is not what you wanted ;-).
The reason I mention this is because I think with a bit more
polishing and some background description your message is a good
material to add to Documentation/howto/.
prev parent reply other threads:[~2008-01-03 17:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-02 19:25 Stitching together private svn repo and public git repo Gregory Jefferis
2008-01-02 21:40 ` Charles Bailey
2008-01-02 22:13 ` Dmitry Potapov
2008-01-02 22:46 ` Charles Bailey
2008-01-03 14:43 ` Gregory Jefferis
2008-01-03 17:24 ` Junio C Hamano [this message]
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=7vd4sistyo.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=charles@hashpling.org \
--cc=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=jefferis@gmail.com \
/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.