threads / discuss / 17384
Subject: connecting existing local git repository to svn
Ittay DrorHi,
I'd like to create a branch in a subversion repository so that I can work with git-svn on it.
My git repository is already with a history, that I don't want to replicate to subversion, I want to start with subversion having just the latest revision and then continue from there normally (git svn dcommit/rebase).
How can I do that?
Thanks,
Ittay
Michael J GruberRe: connecting existing local git repository to svn
Ittay Dror venit, vidit, dixit 01/27/09 05:10:
> Hi, > > > I'd like to create a branch in a subversion repository so that I can > work with git-svn on it. > > > My git repository is already with a history, that I don't want to > replicate to subversion, I want to start with subversion having just the > latest revision and then continue from there normally (git svn > dcommit/rebase). > > > How can I do that?
Create the svn branch (with svn) and "git svn clone". Pull in your git branch under a new name (if that is what you want). Now, you can e.g. "git merge -s theirs" your other git branch into master, git svn rebase and dcommit. Untested, but comes with best wishes ;)
Do you want to discard your existing git history completely?
Cheers, Michael
Ittay DrorRe: connecting existing local git repository to svn
Michael J Gruber wrote:
> Ittay Dror venit, vidit, dixit 01/27/09 05:10: > >> Hi, >> >> >> I'd like to create a branch in a subversion repository so that I can >> work with git-svn on it. >> >> >> My git repository is already with a history, that I don't want to >> replicate to subversion, I want to start with subversion having just the >> latest revision and then continue from there normally (git svn >> dcommit/rebase). >> >> >> How can I do that? >> > > Create the svn branch (with svn) and "git svn clone". Pull in your git > branch under a new name (if that is what you want). > Now, you can e.g. "git merge -s theirs" your other git branch into > master, git svn rebase and dcommit. Untested, but comes with best wishes ;) >
but wouldn't that create a revision in svn for each commit in git?
what i want is something like:
git: ----v1----v2----v3--v4---v5 svn: \---v4--v5
so the svn history starts from v3, but the git history remains unchanged.
ittay
> Do you want to discard your existing git history completely? > > Cheers, > Michael >
Sverre RabbelierRe: connecting existing local git repository to svn
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
Ittay DrorRe: connecting existing local git repository to svn
Sverre Rabbelier wrote:
> 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 >
sorry, my ascii art was confusing:
git: ----v1----v2----v3--v4---v5 svn: v1-4---v5
v1-4 is v1 to v4 squashed together. (e.g., if i added a file in v2 and removed in v3 it will not appear in svn history)
hope it is clear now.
ittay
> commits individually. Of course, don't forget to make a backup before > you start messing around :P. > >
Michael J GruberRe: connecting existing local git repository to svn
Ittay Dror venit, vidit, dixit 01/27/09 13:48:
> > Sverre Rabbelier wrote: > >> 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 >> > sorry, my ascii art was confusing: > > git: ----v1----v2----v3--v4---v5 > svn: v1-4---v5 > > v1-4 is v1 to v4 squashed together. (e.g., if i added a file in v2 and > removed in v3 it will not appear in svn history)
Well, for git and svn "revisions" are really "versions" of the complete tree, not changesets. Have messed around with hg lately? ;)
On the other hand, a commit that introduces a new version is the difference with respect to the previous "version".
Ususally it's clear what is meant, but you seem to mix both notions.
So, if v? denotes a version, then v4 is the result of all commits leading up to v4. It *is* v4. "squashing" applies only to commits ("changes").
In any case, Sverre's as well as my suggestions should do what you want. Why not try it out if you doubt it?
Cheers, Michael
Ittay DrorRe: connecting existing local git repository to svn
Michael J Gruber wrote:
> Ittay Dror venit, vidit, dixit 01/27/09 13:48: > >> Sverre Rabbelier wrote: >> >> >>> 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 >>> >>> >> sorry, my ascii art was confusing: >> >> git: ----v1----v2----v3--v4---v5 >> svn: v1-4---v5 >> >> v1-4 is v1 to v4 squashed together. (e.g., if i added a file in v2 and >> removed in v3 it will not appear in svn history) >> > > Well, for git and svn "revisions" are really "versions" of the complete > tree, not changesets. Have messed around with hg lately? ;) > > On the other hand, a commit that introduces a new version is the > difference with respect to the previous "version". > >
here's a new one:
initial git: --- c1 --- c2 --- c3 --- c4
create svn: git: --- c1 --- c2 --- c3 --- c4 svn --- c1|c2|c3|c4
where c1|c2|c3|c4 is the squashing of all commits into one. it is the first revision in the svn repository c1|c2|c3|c4 === r1
do some work, commit, dcommit: git: --- c1 --- c2 --- c3 --- c4 --- c5 svn --- c1|c2|c3|c4 --- r2
where 'r2' is revision 2 of the svn repository and contains the same changes as c5. that is diff(r2, r1) is the same as diff(c5, c4)
so the svn history starts from how the working tree looks like when it is created and progresses from there. the git history is unaltered. i want to keep on working on 'master' in git (and 'git log' should show all commits as before).
> Ususally it's clear what is meant, but you seem to mix both notions.
>
> So, if v? denotes a version, then v4 is the result of all commits
> leading up to v4. It *is* v4. "squashing" applies only to commits
> ("changes").
>
> In any case, Sverre's as well as my suggestions should do what you want.
> Why not try it out if you doubt it?
> well, sverre's suggestion says it will dcommit each git commit individually and i think your suggestion means i discard my git history in the branch i'm working on.
thank you, ittay
> Cheers, > Michael >