Re: After git svn clone master is tied to a branch in svn, howto set master to trunk

[Michael J Gruber <git@drmicha.warpmail.net>]

Svenn Are Bjerkem venit, vidit, dixit 11.03.2009 16:17:
> Hi,
> after performing a
> $> git svn clone https://svnserver/svn/a/b/c -T trunk/current -t tags -
> b branches
> I find that the git master has been tied to one of the branches. It
> turns out that the highest svn revision number in the repository was
> tied to that branch.
> 
> For historical reasons we have subdirectories in trunk/ on svn, but I
> inspected .git/config
> [svn-remote "svn"]
>         url = https://svnserver/svn
>         fetch = a/b/c/trunk/current:refs/remotes/trunk
>         branches = a/b/c/branches/*:refs/remotes/*
>         tags = a/b/c/tags/*:refs/remotes/tags/*
> And I assume it picked up the strange trunk correctly.
> 
> I have been googling around for a while looking for instructions how
> to tell git that when I check out "master" it should be "trunk" from
> svn and not "branches/next_gen", or more precisely how to move master
> to trunk from branches/next_gen.
> 
> I guess I could solve the problem by modifying a file in trunk on svn
> and commit so that the trunk will get the highest svn revision number
> again and redo the clone.

I'm not quite sure what you mean by master being "tied" to an svn
branch. You mean you want master to track the svn trunk? Then

git branch -D master
git checkout --track -b master trunk

should do (assuming you haven't worked on master yet).

Michael