Migrating from Subversion to Git

I've been helping a company move its source code from Subversion to Git recently to support their Agile transition. They're moving their build, issue tracking and code repos to Visual Studio Team Services (VSTS). This is the cloud-hosted version of Microsoft's Team Foundation Services, with built in Git hosting, build tasks and a Jira-like issue tracking system. I really like it, plus it's free for teams of 5 or less, making it perfect for my development needs at home. Check it out at VisualStudio.com

 Most of my customer's projects don't need to keep their Subversion history - unfortunately they had no policy for commenting commits and most check-ins have empty messages so aren't of much use. The teams have made a conscious decision to abandon the past and drop the history. We will keep the old SVN repos alive for a while so if we really need to we can look back at changes, but don't expect to use it much. The simplest way to migrate these projects is to export them and add them as a new Git repo.

svn export http://svn.example.com/subversion/ ↩
    Project/trunk/ Project

A    Project
A    Project\src
A    Project\src\MyFile.java
Exported revision 18.

 Now over in VSTS you can make a new project, or add a repository to an existing project and push the code up:

 

VSTS prompts you for the new repo name, and lets you add a default .gitignore file for the project's language:


Then you can go back to the command line and associate your code with the new VSTS repository.  First off, initialize Git so that your project can be checked in:
git init 

 Initialized empty Git repository in C:/tmp/export/Project/.git/

Then you will add a Remote to your repository, telling it about the VSTS Git server so you can share your code with other people.
git remote add ↩
     origin https://x.visualstudio.com/GitDemo/_git/FreshRepo

The URL for your new repo can be found by clicking on the Clone button in VSTS.  Now you want to pull down the master branch, and track it so that you are working on it:
git pull origin master

 remote:
 remote:                    vSTs
 remote:                  vSTSVSTSv
 remote:                vSTSVSTSVST
 remote: VSTS         vSTSVSTSVSTSV
 remote: VSTSVS     vSTSVSTSV STSVS
 remote: VSTSVSTSvsTSVSTSVS   TSVST
 remote: VS  tSVSTSVSTSv      STSVS
 remote: VS   tSVSTSVST       SVSTS
 remote: VS tSVSTSVSTSVSts    VSTSV
 remote: VSTSVST    SVSTSVSTs VSTSV
 remote: VSTSv        STSVSTSVSTSVS
 remote:                VSTSVSTSVST
 remote:                  VSTSVSTs
 remote:                    VSTs    (TM)
 remote:
 remote:  Microsoft (R) Visual Studio (R) Team Services
 remote:
 Unpacking objects: 100% (3/3), done.
 From https://x.visualstudio.com/GitDemo/_git/FreshRepo
  * branch            master     -> FETCH_HEAD
  * [new branch]      master     -> origin/master

You are now able to commit your code and push up to the new repository.  Next time I will cover how to keep your branches in Git.
Location: Titirangi, Auckland 0604, New Zealand

Comments

Post a Comment

Popular posts from this blog

Feature Toggles on a .Net Core API

This is my second tutorial on feature toggling.  You can read the first here . There are many languages and frameworks to choose from when it comes to back ends - I wanted to make a REST service to deliver all of the Time Entries to my Angular application, and almost every language available has REST server capabilities.  I chose to use .Net Core (C#) and Java for my example app.  My background is in Java, and I was really interested to see how .Net Core works.  If you don't know, .Net Core is Microsoft's cross platform offering - it has the Windows-specific parts taken out and runs on Docker. Linux, MacOSX, and of course Windows too.  It can also be compiled on other platforms too, which is very handy. Today I'll be setting up LaunchDarkly using the .Net libraries - I'll do the Java version later on.  LaunchDarkly provides some samples  to help you get started, but I wanted to change a few things.  Just like I did in the Angular front end, I ...
Keep reading

Setup a Kubernetes Cluster on Azure

Image
Photo by  Joseph Barrientos  on  Unsplash I finally received my copy of Kubernetes: Up and Running by Kelsey Hightower  (put on pre-order more than a year ago!), and want to set up a Kubernetes cluster to experiment with.  I'm going to use Microsoft's Azure Container Service, but I want to set this up programmatically.  This will let me set up and tear down the cluster whenever I want to, and make sure that it's configuration doesn't drift over time.  This gives me confidence that I can recreate the cluster in exactly the same way later on, if I need to - if I want to move to a different region or resource group or whatever.  This also fits with the DevOps Infrastructure As Code philosophy, allowing you to check your resource scripts into source control and treat them the same as the code that's running on them. There are a couple of prerequisites I need to set up before I get started.  Firstly - I've just talked about versioning the ...
Keep reading

Automatically Logging PowerShell in to Azure

Image
I've been working with Azure Resource Manager templates a lot lately, as an easy, repeatable way to create deployment environments for my code.  ARM templates are a JSON description of a resource or grouping of resources and can be applied to create or update an environment.  This means you can roll out a new environment quickly and easily - perfect for quickly setting up a Dev or Test system, and you know that if you use the same templates to configure Production you won't have any surprises, or "Well, it worked in Dev..." conversations. The best thing about ARM templates for me is how easy it is to generate them.  If you have a resource group, you can create a template by clicking on the Automation Script button: This will create a show you a JSON template and supporting files that can be downloaded as a Zip.  It contains all the information needed to reproduce your resource group's infrastructure.  It isn't a backup though - it doesn't have the we...
Keep reading