Hi there. I've been able to complete every step of the migration up until the sync-rebase step from this guide:
The repo will eventually end up in a Stash repo, but I'm using a local repository for the transition period.
I was able to perform a successful "git svn fetch" to see commits coming in from the old SVN repo. However, I receive the following error when I try these commands:
Note that I tried out the second command because of this thread. I had received the same warning from git-svn about needing to default the prefix to origin/
Both of those commands resulted in this error:
fatal: ambiguous argument 'remotes/trunk': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' Error finding tracking ref for branch master
Some other info:
Hi Matthew, I have had the same problem but could not find a direct fix.
What I decided is to manually proceed with a merge: merge my origin/trunk (svn/trunk in my case) with the master. Then I could see the latest update received from "git svn fetch"
Hope this can help :)
I had the same problem, but using --prefix='' solved the problem. Would be nice if the documentation (https://www.atlassian.com/git/tutorials/migrating-convert) is updated. Using the following: svn-migration-scripts: using version 0.1.56bbc7f Git: using version 2.6.2 Subversion: using version 1.8.8 git-svn: using version 2.6.2
@Matt Holbrook-Bull It's been a while since I've used git-svn, and as such please take everything here with a grain of salt.
In theory you should just be able to rename the branch/tags locally to the expected format and it should work. So for example changing "refs/remotes/origin/tags/*" to "refs/remotes/tags/*". Before doing any manual changes on your repository I would first suggest taking a full backup of the clone (especially the .git folder) so that you don't have re-do the clone.
Changing the refs themselves should just require moving the .git/refs/remotes/origin contents up a directory. You'll also need to edit the .git/config file to something like this, where you no longer see 'origin/' in the fetch/branches/tags configuration.
[svn-remote "svn"] url = https://svn.company.com/repos/ fetch = project-foo/trunk:refs/remotes/trunk branches = project-foo/branches/*:refs/remotes/* tags = project-foo/tags/*:refs/remotes/tags/*
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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