svn-rebase doesn't work when you have a master git branch and no trunk folder in svn

Issue #7 new
Simon Tremblay created an issue

Error log when I run java -Dfile.encoding=utf-8 -jar ~/svn-migration-scripts.jar sync-rebase:

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

Should be nice to add a command line option to specify what is the corresponding svn folder for master git branch when doing a sync-rebase.

Comments (6)

  1. Scott Russell

    The 'git svn clone' solution found on @thekop69 's linke worked for me, when I included an explicit argument for defining trunk. I have a non-standard-layout SVN repo (just "Trunk" as the one branch, w/no tags), so I was successfully w/using the 'sync-rebase' task after cloning as follows:

    ~/GitMigration $ git svn clone --prefix='' --authors-file=authors.txt --trunk=/Trunk https://svnrepourl.com/parentdirectory GITREPONAME
    

    I needed both the --prefix parameter and the explicit trunk name parameter to successfully run java -jar migration-scripts.jar sync-rebase.

  2. Log in to comment