From: Sverre Rabbelier <srabbelier@gmail.com>
To: Ittay Dror <ittay.dror@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>, git@vger.kernel.org
Subject: Re: connecting existing local git repository to svn
Date: Tue, 27 Jan 2009 13:16:33 +0100 [thread overview]
Message-ID: <bd6139dc0901270416u22b60fefp472935470b1db929@mail.gmail.com> (raw)
In-Reply-To: <497EE4E8.8070705@gmail.com>
On Tue, Jan 27, 2009 at 11:41, Ittay Dror <ittay.dror@gmail.com> wrote:
> git: ----v1----v2----v3--v4---v5
> svn: \---v4--v5
>
> so the svn history starts from v3, but the git history remains unchanged.
Create the new branch from v3 then, and use git svn to pull it in.
Then you can do 'git rebase that-svn-branch' on your git branch to put
all commits (not as one big commit) on top of that branch point. Now
you 'git checkout' that-svn-branch and do 'git reset --hard
the-git-branch', which should now consist of
v1--v2--v3--v4(git)--v5(git), etc. If you do 'git svn dcommit' from
the that-svn-branch now it should dcommit to svn each of your git
commits individually. Of course, don't forget to make a backup before
you start messing around :P.
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-01-27 12:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-27 4:10 connecting existing local git repository to svn Ittay Dror
2009-01-27 10:35 ` Michael J Gruber
2009-01-27 10:41 ` Ittay Dror
2009-01-27 12:16 ` Sverre Rabbelier [this message]
2009-01-27 12:48 ` Ittay Dror
2009-01-27 13:02 ` Michael J Gruber
2009-01-28 5:26 ` Ittay Dror
-- strict thread matches above, loose matches on Subject: below --
2009-01-26 19:29 Ittay Dror
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=bd6139dc0901270416u22b60fefp472935470b1db929@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=ittay.dror@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 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).