Branches with git-svn

Branches with git-svn

[Xavier Claessens]

Hi,

I created a git repository using "git-svn clone <url>" a long time ago.
But now I realise that I don't get SVN branches into my git repository.
I see that the doc tells to use "git clone -t tags -b branches -T trunk
<url>" to create the repository. If I create a new repository with that
command, I get branches and tags.

However I have lots of contributors having branches based on my git
repository. Is there a way to add SVN branch to my existing git repo?

Thanks!

Xavier Claessens.

Re: Branches with git-svn

[Michael J Gruber]

Xavier Claessens venit, vidit, dixit 19.09.2008 12:15:
> Hi,
> 
> I created a git repository using "git-svn clone <url>" a long time ago.
> But now I realise that I don't get SVN branches into my git repository.
> I see that the doc tells to use "git clone -t tags -b branches -T trunk
> <url>" to create the repository. If I create a new repository with that
> command, I get branches and tags.
> 
> However I have lots of contributors having branches based on my git
> repository. Is there a way to add SVN branch to my existing git repo?

If you haven't use those options back then, then what was the svn repo
structure - no trunk, just main?
Did you change the structure now?

If you git-svn fetch from that new structure then all your new branches
etc. will show up as subdirectories, which is most certainly not what
you want.

So, what was the structure in svn like before, and have your
contributors based their branches on the mis-imported new structure already?

Michael

Re: Branches with git-svn

[Björn Steinbrink]

On 2008.09.19 14:35:07 +0200, Michael J Gruber wrote:
> Xavier Claessens venit, vidit, dixit 19.09.2008 12:15:
> > I created a git repository using "git-svn clone <url>" a long time ago.
> > But now I realise that I don't get SVN branches into my git repository.
> > I see that the doc tells to use "git clone -t tags -b branches -T trunk
> > <url>" to create the repository. If I create a new repository with that
> > command, I get branches and tags.
> > 
> > However I have lots of contributors having branches based on my git
> > repository. Is there a way to add SVN branch to my existing git repo?
> 
> If you haven't use those options back then, then what was the svn repo
> structure - no trunk, just main?
> Did you change the structure now?

No, he was just using "git svn clone svn://host/repo/trunk", ie. single
branch tracking. We solved that on #git, adjusting the url and fetch
line, as well as adding the branches and tags line in the svn-remote
section in the config.

Björn

Re: Branches with git-svn

[Xavier Claessens]

On ven, 2008-09-19 at 14:35 +0200, Michael J Gruber wrote:
> Xavier Claessens venit, vidit, dixit 19.09.2008 12:15:
> > Hi,
> > 
> > I created a git repository using "git-svn clone <url>" a long time ago.
> > But now I realise that I don't get SVN branches into my git repository.
> > I see that the doc tells to use "git clone -t tags -b branches -T trunk
> > <url>" to create the repository. If I create a new repository with that
> > command, I get branches and tags.
> > 
> > However I have lots of contributors having branches based on my git
> > repository. Is there a way to add SVN branch to my existing git repo?
> 
> If you haven't use those options back then, then what was the svn repo
> structure - no trunk, just main?
> Did you change the structure now?
> 
> If you git-svn fetch from that new structure then all your new branches
> etc. will show up as subdirectories, which is most certainly not what
> you want.
> 
> So, what was the structure in svn like before, and have your
> contributors based their branches on the mis-imported new structure already?

Hi,

Thanks for your email, but Björn Steinbrink on IRC solved my problem.
For the record what I did is:
1) make a new "git svn clone -t tags -b branches -T trunk <url>"
2) copy/past the description of the "svn" remote in .git/config from the
new clone into my old repository. Just replaced, in right part of the
fetch line, "trunk" by "git-svn"
3) "git svn fetch" imported all branches correctly based on the commits
I already have.

Thanks to all git and git-svn developers to make my life easier!

Xavier Claessens.