Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Fwd: git svn with non-standard svn layout

From: Chris Harris <hidden>
Date: 2016-06-15 22:52:06

I am using  git version 1.7.6.4 built from the latest stable source on
github.   Running Ubuntu with kernel 2.6.38-11-generic

I can't seem to git git svn to see my branches correctly.
Unfortunately my svn repository is not open source, so I can not post
it here, but I will try to explain my issue.
We use a non standard svn layout like the following
branches
        V4.1
                V4.1.0
                V4.1.1
dev


dev is our trunk, and our branches have 2 levels.
I first use git init, then setup my config as follows
[svn-remote "svn"]
url = file:///home/chris/svnrepo
fetch = dev:refs/remotes/trunk
branches = branches/V4.1/{V4.1.1}:refs/remotes/branches/*
For this example I am just trying to make a single branch work.
After a fetch all revisions are ok. master correctly points to
remotes/trunk,but gitk shows the following:

o remotes/branches/V4.1.1
|
o some commit
|
|
|    o master - remotes/trunk
|    |
|    o another commit
|    /
|
etc
( sorry for the bad ascii art. )
My issue is that trunk ( master ) appears to be a  branch from V4.1.1
instead of  V4.1.1 being a branch from trunk ( master )
git log --graph shows the same structure.
Any suggestions on how to configure this so git svn maps my
non-standard layout correctly?
Thank you
Chris
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help