Where do I put the files above the trunk?

I am migrating my svn repository to git with the follow toturial:

https://go-dvcs.atlassian.com/display/aod/Migrating+from+Subversion+to+Git+on+Bitbucket

After migrating the first project, I noticed that the root of git is the trunk (master) and all the files I had above it were not migrated.

These files are important, did contain documentation, files needed for the environment, test cases, scripts and other auxiliaries. They are all common for trunk, branch and tags and are too large to be cloned often.

Ever had any similar problem? There is some suggestion of where to put these files?

Thanks!

Ronaldo!

1 answer

1 accepted

Accepted Answer
0 votes

Ronaldo,

Git and the git-svn tools can be pretty opinionated. It is generally assumed that nothing is above trunk/ tags/ or branches/ in your repo heirarcy. If you want the items above it, you'll probably want to git-svn clone just the files above trunk into their own repository, then graft the two repositories together, placing those files inside a directory in your repo, or leaving them out on their own.

I found a post explaining how to do this over at Stack Overflow:

http://stackoverflow.com/questions/1153633/how-does-git-svn-behave-with-svn-repositories-that-have-changed-layout

Which led to http://blog.tfnico.com/2010/10/gitsvn-6-grafting-together-svn-history.html

I also found this one, which seems to have a bit more detail: http://ben.straubnet.net/post/939181602/git-grafting-repositories

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Sep 18, 2018 in Jira

What modern development practices are at the heart of how your team delivers software?

Hey Community mates! Claire here from the Software Product Marketing team. We all know software development changes rapidly, and it's often tough to keep up. But from our research, we've found the h...

25,361 views 2 7
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you