git-svn

How can I upgrade the SVN version used by git svn in Windows?

那年仲夏 提交于 2019-12-21 17:47:57
问题 My company is in the process of upgrading SVN to 1.7. Checking git svn --version shows that the SVN version being used is 1.4.6. I'd like to get the version of SVN that git svn uses up closer to 1.7. However, I've seen no instructions for updating the version of SVN that git svn uses (in Windows). The other thread I found looking for answers seems to be oriented to a Mac OSX user. I haven't seen Windows instructions for this upgrade, however. Does anyone know how to properly update the SVN

git-svn “Couldn't find revmap for”

℡╲_俬逩灬. 提交于 2019-12-21 17:03:09
问题 I followed this tutorial: http://www.beletsky.net/2011/06/how-to-start-using-git-in-svn-based.html I did this and it worked fine for a while i could rebase and dcommit and all. But then I got an error when doing "git svn rebase": "Couldn't find revmap for" It seems that git-svn suddenly thinks that my branch is the svn trunk... This might be the answer: git-svn import only branch But I am simply not smart enough to unserstand it. Edit What I did between the "git svn rebase" that worked and

Difference between git pull --rebase, git rebase and git merge

泪湿孤枕 提交于 2019-12-21 15:37:48
问题 Could anyone explain this with keeping even the remote repositories in mind? 回答1: git pull --rebase is the way to go when you want to bring your development branch up to date - those branches are usually not published to others (except maybe for having a look at it) so rewriting history is not a problem and you really don't want merges etc in such a branch. git merge performs a merge; see the manpage for details - the comand has tons of options which would be too much to explain here. git

SubGit: How to exclude branches?

偶尔善良 提交于 2019-12-21 13:22:48
问题 I'm testing SubGit as a way of migrating from SVN to Git. What I would like to do is be able to create remote branches in the git repository that all users can use that does not sync back to SVN. I only want SubGit to track the master branch and sync it back to SVN so that we have the freedom to use and share other Git branches. Is there a simple way to do this? Thank you 回答1: The ideal solution would be specifying trunk:refs/heads/master mapping in SubGit configuration, so SubGit would

SubGit: How to exclude branches?

我的梦境 提交于 2019-12-21 13:22:17
问题 I'm testing SubGit as a way of migrating from SVN to Git. What I would like to do is be able to create remote branches in the git repository that all users can use that does not sync back to SVN. I only want SubGit to track the master branch and sync it back to SVN so that we have the freedom to use and share other Git branches. Is there a simple way to do this? Thank you 回答1: The ideal solution would be specifying trunk:refs/heads/master mapping in SubGit configuration, so SubGit would

How does git-svn behave with svn repositories that have changed layout?

冷暖自知 提交于 2019-12-21 12:42:56
问题 This question is similar to this one and this one, but the scenario is slightly more complex. I started out a few years ago with a private svn repository (which I use mainly for shared config files and the like between various machines). I wasn't too careful with the layout of the repository (where branches, go, etc.), so it changed quite a lot over time. This was, of course, a mistake, but it's too late now. More recently, I've migrated it to a more standard svn trunk/branches/tags layout,

How does git-svn behave with svn repositories that have changed layout?

China☆狼群 提交于 2019-12-21 12:41:12
问题 This question is similar to this one and this one, but the scenario is slightly more complex. I started out a few years ago with a private svn repository (which I use mainly for shared config files and the like between various machines). I wasn't too careful with the layout of the repository (where branches, go, etc.), so it changed quite a lot over time. This was, of course, a mistake, but it's too late now. More recently, I've migrated it to a more standard svn trunk/branches/tags layout,

git svn clone fails with “error: git-svn died of signal 11”

倖福魔咒の 提交于 2019-12-21 12:24:50
问题 I am trying to move my huge SVN repository into Git using a Ubuntu 16.4 machine. For this purpose I am following this tutorial: https://www.atlassian.com/git/tutorials/svn-to-git-prepping-your-team-migration I have installed the latest Git, SVN and git-svn tools. My problem is that each time I rung the 'git svn clone' command I am getting this error 'error: git-svn died of signal 11' without any further information. Searching a bit in this forum I found another post: git svn clone died of

Git-Svn dcommit causes branch splitting

左心房为你撑大大i 提交于 2019-12-21 09:23:13
问题 I'm having a problem with git-svn dcommits making the git repository lose track of which commits are which. I try to make sure that the master branch in git always follows trunk in the SVN repository. So whenever I'm working, I'm on a topic branch. Here's my scenario: Working in a topic branch for a while git checkout -b my-topic git commit -m "blah blah blah" Then I decide I'd like to merge my branch back in to master git checkout master git svn rebase #get any changes in svn git rebase

git - how can I clone local svn repository?

元气小坏坏 提交于 2019-12-21 06:51:06
问题 I am completely unable to find any explanation how I should specify location of existing svn repository. In other words - what should be used as URL in git svn clone URL when svn repository is local? 回答1: You should be able to succeed like this: git svn clone file:///e/svn_repo_on_E_drive Similar to svn checkout command: svn co file:///e/svn_repo_on_E_drive file:// for folder on the current drive of the executing CMD prompt, file:///d/some_folder for D:\some_folder . Note: The extra / and the