The git flow is not installed in your machine. Just run this command, macOS: $ brew install git-flow-avh Linux: $ apt-get install git-flow Windows: $ wget -q -O – –no-check-certificate https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash Source git-flow cheatsheet by Daniel Kummer After successful installation run git flow init in your project and then follow the … Read more
I noticed this question because I got the same error message: W: Refspec glob conflict (ref: refs/remotes/trunk): expected path: branches/trunk real path: trunk It turned out that .git/config had duplicate lines that seem to confuse git-svn, like this: [svn-remote “svn”] … branches = project/branches/*:refs/remotes/* tags = project/tags/*:refs/remotes/tags/* branches = project/branches/*:refs/remotes/* tags = project/tags/*:refs/remotes/tags/* Removing those … Read more
It becomes verbose after fetching the first relevant commit. But until it fetches that commit, you can ensure the command is working properly by checking the .git\svn\.metadata file. The lines branches-maxRev = 123 and tags-maxRev = 123 will keep updating and increasing their numbers as it works.
I had the same problem, tried the solutions mentioned so far without success. But my problems with git gc began after I added big image files to repo, so I created .gitattributes file and turned off delta compression for those big files: *.tga -delta *.psd -delta It worked.
Without knowing exactly where those empty directories came from, you could tell git-svn to remove them by using the –rmdir command line option or svn.rmdir configuration option. See git-svn OPTIONS man page and Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not … Read more
I don’t have the complete answer, but this error is generated by git-svn.perl. (The relevant code path seems to be do_fetch -> make_log_entry -> find_extra_svn_parents -> lookup_svn_merge.) That code appears to be trying to look at a svn merge commit’s svn:mergeinfo property to figure out all its parent commits/branches, in hopes of turning that into … Read more
What I have done in the past is: Import the CVS repository Using: $ git cvsimport -C target-cvs -r cvs -k -vA authors-file.txt -d $CVSROOT module Where: target-cvs is the directory to keep my local copy of the repository. cvs is the name to use for referencing the remote repository. So, I will have cvs/master, … Read more
Have you tried git ls-tree? git ls-tree –name-only -r <branch_name> –name-only gives you just the file names. -r recurses into sub directories. If you want the name of the sub-directory listed before recursing into it, add -t to the argument list.
Lee B was right. The answer, provided by doener in #git, is to upgrade Git to 1.6.x (I had been using 1.5.x). 1.6.x offers deep cloning so that multiple wildcards can be used with the –branches option: $ git svn clone https://svn.myrepos.com/myproject web-self-serve \ –trunk=trunk –branches=branches/*/* –prefix=svn/ $ git branch -r svn/development/sandbox1 svn/development/feature1 svn/development/sandbox2 svn/development/sandbox3 … Read more
TortoiseGit (https://tortoisegit.org/) added basic support for git-svn in release 0.8.1.0: The release log says: Add Basic Git-SVN Operation: Add SVN DCommit Command Add “SVN Rebase” and “SVN DCommit” command at shell contextmenu Support Git svn-clone at clone dialog.