git-svn

问题 While working on a usual git repository a local branch usually tracks a corresponding remote upstream branch. This way I can easily see, whether I am ahead or behind of my upstream branch and therefore if I need to push or pull to bring them in sync. Also my prompt immediately shows this state, which is very convenient. Now I am working on a SVN repository using git-svn . I used --prefix=svn for the clone, therefore git branch -r lists svn/trunk as a remote branch, but (although git svn

问题 While working on a usual git repository a local branch usually tracks a corresponding remote upstream branch. This way I can easily see, whether I am ahead or behind of my upstream branch and therefore if I need to push or pull to bring them in sync. Also my prompt immediately shows this state, which is very convenient. Now I am working on a SVN repository using git-svn . I used --prefix=svn for the clone, therefore git branch -r lists svn/trunk as a remote branch, but (although git svn

问题 I have two repositories, one is still an svn and acts as the main place, and another is pure git where is the daily work. I've my local clone using git svn clone svn+ssh://... and adding a remote using git remote add git@... . After a refactoring with its commits and branches, the git master has the directory structure modified and when I try to git svn dcommit a bunch of conflicts arise in what looks like a rebase to the svn . It's like the mv of files and directories to rename and relocate

问题 I've migrated a big svn repository with hundreds of branches and tags, split them into multiple repositories and now i'm looking to check if there are any empty* branches/tags in these repositories that should be deleted before pushing the migration live. Is there a faster way to find this than having to go to every repository and checkout every branch ? *For the purpose of this question, "empty branch" or "empty tag" means a branch or tag that points to a commit that contains no files. 回答1:

问题 I'm trying to use GIT-SVN but I'm having problems getting things started. I can clone the svn-repository (or use git svn init and then git svn fetch) without any errors but after the command stops processing, the git repository is empty and there's no local master branch. My svn repository is located in here: https://localhost:8443/svn/projects And the project folder is structured like this: /projectA/trunk /projectA/branches /projectA/tags /projectB/trunk /projectB/branches /projectB/tags

问题 I've been using git-svn and love it. But we just switched our repo to one that requires a svn version of 1.5.0 or greater. Currently, I've got this: triedsound-lm:android holmesj$ git svn --version git-svn version 1.7.3.1 (svn 1.4.4) triedsound-lm:android holmesj$ svn --version svn, version 1.6.15 (r1038135) compiled Nov 29 2010, 13:32:56 So, when I try to dcommit, I get this error message: ... ... A repository hook failed: Commit blocked by start-commit hook (exit code 1) with output: Only

问题 I have a clone of an SVN repo on my machine for which the SVN server is unreachable. The program used for cloning is Tortoise SVN for Windows. Is there any way to import the commit history of the repo into a git repository on github? I tried svnadmin dump repo/.svn > svn.dump Resulting in svnadmin: E165005: Expected repository format '3' or '5'; found format '12' Which seems to be misleading, meaning I cannot dump that copy. But are there options other than dumping? 回答1: I suspect now this is

问题 I have a clone of an SVN repo on my machine for which the SVN server is unreachable. The program used for cloning is Tortoise SVN for Windows. Is there any way to import the commit history of the repo into a git repository on github? I tried svnadmin dump repo/.svn > svn.dump Resulting in svnadmin: E165005: Expected repository format '3' or '5'; found format '12' Which seems to be misleading, meaning I cannot dump that copy. But are there options other than dumping? 回答1: I suspect now this is

问题 I'm using git-svn to interact with a remote svn repsitory that follows the traditional layout of trunk, tags, and branches. There's a branch in svn that git has missed the history of. I know the history to be: r0--r1--r2---r4---r6 remotes/trunk \ r3---r5-- remotes/BRANCH_NAME But git seems to have missed the branch point and thinks the history is: r0---r1---r2-----r4---r6 remotes/trunk r0'--r1'--r2'--r3--r5--- remotes/BRANCH_NAME Where r0' , r1' , and r2' are copies of r0 , r1 , and r2 that

问题 I'm using git-svn to interact with a remote svn repsitory that follows the traditional layout of trunk, tags, and branches. There's a branch in svn that git has missed the history of. I know the history to be: r0--r1--r2---r4---r6 remotes/trunk \ r3---r5-- remotes/BRANCH_NAME But git seems to have missed the branch point and thinks the history is: r0---r1---r2-----r4---r6 remotes/trunk r0'--r1'--r2'--r3--r5--- remotes/BRANCH_NAME Where r0' , r1' , and r2' are copies of r0 , r1 , and r2 that