git-svn

warning: refname 'xxx' is ambiguous when using git-svn

由 家住魔仙堡 提交于 2019-12-08 23:01:46
问题 I am using git as a frontend to Subversion (via git svn). So, for every svn trunk/branch I have remote branch in git named "remotes/xxx". For example "remotes/trunk", "remotes/coolfeature". Now I want have one "default" local branch for every remote branch, to use it for dcommit. The problem is that I want such branches to be named after Subversion branches, like "trunk", "coolfeature", so I have the following branches in git: trunk coolfeature remotes/trunk remotes/coolfeature The problem is

Git-2-SVN migration?

由 白昼怎懂夜的黑 提交于 2019-12-08 22:55:28
问题 Yes, I know. Why would you want to migrate from Git to SVN? Well I happen to be in a situation that I need to migrate a huge Git repo to Subversion! Here's one workflow I tried per Edwin's comment: first create a local SVN repo: svnadmin create svn_repo Next I check out my Git repo: git clone git:myNameSpace/myProject cd into the myProject and run: git svn init -s --prefix=svn/ file:///home/myHome/svn_repo/myProject git svn fetch git rev-list --parents master | grep '^.\{40\}$' to look up the

Why is git svn fetch so slow?

由 旧时模样 提交于 2019-12-08 16:16:52
问题 I'm trying to git svn fetch my repo to perform a git rebase -i I'm performing the fetch locally why is it so slow? Should it really take so much time to create 1000 revisions? It seems like the process just "falls a sleep" on a file then suddenly there is a flurry of activity. 回答1: git svn fetch ( and clone) have to do the heavy lifting and create the entire repository, talking to svn and creating the git repository on your local machine. You may do it on the same server where the svn server

How to git clone an SVN repository where all branches are located in root?

由 落花浮王杯 提交于 2019-12-08 16:13:36
My SVN structure is like this: / |-- Branch1 |-- Branch2 |-- Branch3 ... How can I clone this into a git repository preserving the branches (i.e. not flat history)? Bonus question: How to clone only a subset of the SVN branches into a new git repository? I believe that in SVN branches are just folders, its just a convention. Git actually works with branches. With this the approach becomes easier. As you need to fetch the data from SVN repository you will need to create remote for it. From the structure I see that you need to create Branch 1 to 3 in your git repository. Create Git repository.

Timeout setting on git svn fetch operation

由 江枫思渺然 提交于 2019-12-08 09:12:36
问题 I need to set the timeout on git svn fetch command. The fetch process should be timed out if it takes more than specific time interval(say 10 mins).Is it possible do like this in git command itself ? Or any other possible way to do this ? 回答1: In Linux use timeout command: timeout 10m git svn fetch 来源： https://stackoverflow.com/questions/52214581/timeout-setting-on-git-svn-fetch-operation

Find the right parent of a merge commit in a non-interactive way

由 让人想犯罪 __ 提交于 2019-12-08 07:44:27
问题 I'm preparing a svn2git migration and while https://github.com/nirvdrum/svn2git has been incredibly useful, I still ended up with a couple of shenanigans. I've been able to clean up most of them, but one still remains. I have a history that looks like this: A1 - B1 - C1 - E1 - F1 \ A2 - B2 - C2 - D1 A1-C1 and A2-C2 are identical, except for an additional subdirectory level. A2-C2 is really an artifact of the svn migration and of previous git-filter-branch operations, I made sure of that. D1

How to combine multiple svn trunk sub-tree into one git-svn repository?

由 与世无争的帅哥 提交于 2019-12-08 07:17:12
问题 I want to use git-svn to sync svn repository. The svn repository layout is svn/prjA/trunk svn/prjA/branches svn/prjB/trunk svn/prjB/branches Use the following commands will separate into two git repository. git svn clone https://host/svn/prjA/trunk prjA git svn clone https://host/svn/prjB/trunk prjB And the layout will be prjA/.git prjA/... prjB/.git prjB/... If it possible to combine these into one git repository and sync to two sub-directories of svn? And the expected layout like following:

How to combine multiple svn trunk sub-tree into one git-svn repository?

由 余生颓废 提交于 2019-12-08 06:44:29
I want to use git-svn to sync svn repository. The svn repository layout is svn/prjA/trunk svn/prjA/branches svn/prjB/trunk svn/prjB/branches Use the following commands will separate into two git repository. git svn clone https://host/svn/prjA/trunk prjA git svn clone https://host/svn/prjB/trunk prjB And the layout will be prjA/.git prjA/... prjB/.git prjB/... If it possible to combine these into one git repository and sync to two sub-directories of svn? And the expected layout like following: .git prjA/... prjB/... It should be possible to merge multiple Git repositories together, as in "

GIT (DVCS) - Lock or checked out the file (as like svn) and conflict merge the files

由 旧巷老猫 提交于 2019-12-08 06:01:57
问题 I am just moving from SVN to GIT. I have gone through the posts and comments but not finding effective solution. I have a below questions: How to checked out or Lock the files so, other developer is aware that file is unavailable and checked out by this user ? If one user has updated the same file where other user is working on and both have push the changes to master repository. Now, how it resolve the conflicts or merge. How conflict or merge works. Do we have a option to manage conflicts

Missing revisions after “git svn clone”

由 若如初见. 提交于 2019-12-08 03:06:15
问题 After running: git svn clone https://svn.mycompany.eu/project/trunk There are some missing revisions (for exemaple 500 from 4700 of total revisions). It's a problem, because we have joined a number of commits with a number of tasks in Trac. Can anybody help, please? 回答1: You cloned the trunk only, so git-svn didn't detect any branches. Try: git svn clone -s https://svn.mycompany.eu/project Odds are that's where those missing revisions are. If your project does not adhere to SVN conventions,
订阅 git-svn