Hi there. I've been able to complete every step of the migration up until the sync-rebase step from this guide: https://www.atlassian.com/git/migration#!migration-synchronize 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: * java -Dfile.encoding=utf-8 -jar ../svn-migration-scripts.jar sync-rebase * java -Dfile.encoding=utf-8 -jar ../svn-migration-scripts.jar sync-rebase --prefix=origin/ 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 [ ...] -- [ ...]' Error finding tracking ref for branch master --------------------------------- Some other info: * I'm currently on the master branch * here are a few branches listed in 'git branch -r' origin/tags/ap-2.0.9 origin/trunk

nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Having troubles migrating svn to stash at the svn-migration-scripts.jar sync-rebase step

unknown

Hi there. I've been able to complete every step of the migration up until the sync-rebase step from this guide:

https://www.atlassian.com/git/migration#!migration-synchronize

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:

java -Dfile.encoding=utf-8 -jar ../svn-migration-scripts.jar sync-rebase
java -Dfile.encoding=utf-8 -jar ../svn-migration-scripts.jar sync-rebase --prefix=origin/

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 &lt;command&gt; [&lt;revision&gt;...] -- [&lt;file&gt;...]'
Error finding tracking ref for branch master

---------------------------------

Some other info:

I'm currently on the master branch
here are a few branches listed in 'git branch -r'

origin/tags/ap-2.0.9
origin/trunk

Accepted answers

jgauthier

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

Jerome

All comments

jgauthier

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

Jerome

unknown

Thanks for the help Jérôme. I ended up having to do most of the migrations manually myself. Once I performed the steps above, doing a rebase on git repository synced things up nicely.

Support jobs.ch

Workaround for this issue, just use an empty prefix while cloning:

git svn clone --prefix='' --stdlayout --authors-file=...

cofarrell

Not that it helps, but there is a public issue tracking this:

https://bitbucket.org/atlassian/svn-migration-scripts/issue/2/git-20-incompatability

Ramon Padilla

Hi, I've just encountered the same problem and I'm a git newbie. Could you explain what you mean by doing the migrations manually?

jgauthier

Hey, unfortunately it's something I did only once and quite a long time ago, so I don't really remember, sorry. Jerome

Jörgen Persson

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-B

is there any way at all to fix this post-clone? it took so long for our clone to complete Im not sure I have the time to run it again.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

bitbucket-server

bitbucket-administration