[GIT-SVN] master follows not trunk

4 messages, 4 authors, 2016-06-15 · open the first message on its own page

[GIT-SVN] master follows not trunk

From: Bert Wesarg <hidden>
Date: 2016-06-15 22:46:38

Hi,

it seams so, that git-svn sets the master branch to that svn branch
which has the highest revision!

I cloned a svn repo today where exactly this happend. I.e. master
pointed not to the trunk but to the branch with the highest revision.
After trunk moved forward, a git svn rebase told me that master is up
to date.

A second clean clone of this repo and master pointed to trunk.

Is this indented?

Bert

Re: [GIT-SVN] master follows not trunk

From: Deskin Miller <hidden>
Date: 2016-06-15 22:46:38

On Wed, Apr 22, 2009 at 08:21, Bert Wesarg [off-list ref] wrote:
Hi,

it seams so, that git-svn sets the master branch to that svn branch
which has the highest revision!

I cloned a svn repo today where exactly this happend. I.e. master
pointed not to the trunk but to the branch with the highest revision.
After trunk moved forward, a git svn rebase told me that master is up
to date.

A second clean clone of this repo and master pointed to trunk.

Is this indented?
It's well-known, at any rate, and it's somewhat conceptually
consistent with git, which will use the remote's HEAD for its
currently-checked-out branch upon clone.

Consider also that although your svn repository is well-formed and has
trunk/ tags/ branches/, not all do; or, perhaps someone is interested
in only one branch, or put multiple svn-remote.svn.fetch lines in
.git/config before fetching.  Which svn branch should become master
then?

With that said, you're not the first person to be surprised by this;
I'm sure you could patch git svn to tell you which svn branch it was
checking out.  It'd probably be a pretty simple tweak, but
unfortunately I'm not in a position to do it currently.

Deskin Miller

Re: [GIT-SVN] master follows not trunk

From: Eric Wong <hidden>
Date: 2016-06-15 22:46:39

Bert Wesarg [off-list ref] wrote:
Hi,

it seams so, that git-svn sets the master branch to that svn branch
which has the highest revision!

I cloned a svn repo today where exactly this happend. I.e. master
pointed not to the trunk but to the branch with the highest revision.
After trunk moved forward, a git svn rebase told me that master is up
to date.

A second clean clone of this repo and master pointed to trunk.

Is this indented?
Yes it was intended.  It was once the case that several repositories I
tracked had work done almost exclusively in branches and trunk could've
been months/years behind and worthless.

However, this issue has come up many times now so maybe setting
master==trunk if trunk exists (sometimes it does not)...

Any objections?

-- 
Eric Wong

Re: [GIT-SVN] master follows not trunk

From: Pascal Obry <hidden>
Date: 2016-06-15 22:46:39

Eric,
However, this issue has come up many times now so maybe setting
master==trunk if trunk exists (sometimes it does not)...

Any objections?
I think it is a good idea as this would be just right in most cases.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help