Tag: svn

Git (from SVN) to TFVC

I have a Git repo with 10 commits, branches (like trunk), and am using git–tfs. I used svn2git to migrate my SVN repo to Git, but now I would like to migrate my Git history and branches over to TFVC. In git-tfs, it looks like there is git tfs rcheckin and that can migrate each […]

GIT-SVN fixing history of tag which is not whole copy of branch/trunk

I am working on large project in SVN and I am using GIT-SVN. Following illustrate my problem in SVN   trunk      |- kernel1      |- kernel2      |- custom1      |- custom2   branches      |-kernel_RC1         |- kernel1         |- kernel2 Problem is that branch kernel_RC1 with its children is created in one commit and GIT-SVN did not recognise that kernel_RC1/kernel1 is […]

Howto see both git and svn operations in Team menu in Eclipse?

I have code on company-wide svn server. However, sometimes I want to use git to manage my local hacking and commit to svn later when there is some working code available. So the normal workflow is to checkout code from svn (svn co http://svnserver/svn/project), cd to the project, run git flow init -d, create some […]

How to handle this situation in Version Control System better?

I have this thinking when I am dealing with a project, which is provided to many clients with one web software bundle, and every client could have some new change requests on it, so I will have to use one repo(or branch) for one client, so I can keep updating it for their own requests. […]

Migrating from SVN to Git with non-standard svn layout (need full history)

I am trying to migrate an svn repo to git from this existing svn structure: branches/ branches/d10 branches/R10 We do not have a Trunk in the clssical sense. located at https://svn.mycompany.com/svn/project1/ I know this is the non stdlayout and I only really care about the R10 branch (the release branch). I have tried a few […]

Workflow for git merging and cherry picking in a migrated subversion repository

My team is transitioning from SVN to git, and one of the things I’m trying to sort out is a long term branching strategy. In SVN we had our trunk, and then several release branches which each represented a major platform revision (V1, V2, etc). Our workflow for something like a bug fix or patch […]

How do I put a new Git repo to an SVN server?

I have a git repo that I want to push to my SVN server. So I followed some tutorials on the web and I always end up with the same message. $ git svn dcommit Unable to determine upstream SVN information from HEAD history. Perhaps the repository is empty. at /usr/libexec/git-core/git-svn line 866. Here is […]

git checkout from network fileshare

I have install git and tortoisegit successfully create a bare repo location of my network folder X:\Test\Test_Source\Test_repo\Test_Repo.git –> bare repo These are the folder in my repo 1. A 2. B 3. C How to checkout only folder B?

git procedure to merge branches from origin

I am a member of a Github repository where there are three branches, master, dev and deployment. I cloned the repository on my local computer with: git clone git@github.com:COMPANY/repo.git What I need to do is to merge the changes that were pushed in the dev branch into the master branch, and then the master branch […]

Migrate SVN to Git, lost all source files and most commits

I’m trying to migrate a SVN repo to git. I followed https://www.cocoanetics.com/2013/03/moving-from-svn-to-git/ and http://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git step by step, git svn clone generates the following output: $ git svn clone https://zuoyao@10.61.0.242/adasvn/system/graph_db/ –authors-file=users.txt –no-metadata –stdlayout graph_db > svn2git.log Using higher level of URL: https://zuoyao@10.61.0.242/adasvn/system/graph_db => https://zuoyao@10.61.0.242/adasvn Found possible branch point: https://zuoyao@10.61.0.242/adasvn/system/graph_db/ada-main => https://zuoyao@10.61.0.242/adasvn/system/graph_db/branches/old-hbase-partition-schema, 283 Initializing parent: refs/remotes/origin/old-hbase-partition-schema@283 Found […]

Git Baby is a git and github fan, let's start git clone.