From fb05fa859e5f552e8b84f07d741ea7a68b121f80 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 15 Oct 2014 11:35:16 +0200 Subject: [PATCH 1/4] Add a doc on how to migrate from SVN to gitlab. --- doc/workflow/migrating_from_svn.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/workflow/migrating_from_svn.md diff --git a/doc/workflow/migrating_from_svn.md b/doc/workflow/migrating_from_svn.md new file mode 100644 index 00000000000..7ff157f482e --- /dev/null +++ b/doc/workflow/migrating_from_svn.md @@ -0,0 +1,17 @@ +# Migrating from SVN to GitLab + +SVN stands for Subversion and is a version control system (VCS). +Git is a distributed revision control and source code management (SCM) system. + +There are some major differences between the two, for more information consult your favourite search engine. + +Git has tools for migrating SVN repositories to git, namely `git svn`. You can read more about this at +[git documentation pages](http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion). + +Apart from the [official git documentation](http://git-scm.com/book/en/Git-and-Other-Systems-Migrating-to-Git) there is also +user created step by step guide for migrating from SVN to GitLab. + +[Benjamin New](https://github.com/leftclickben) wrote [a guide that shows how to do a migration](https://gist.github.com/leftclickben/322b7a3042cbe97ed2af). Mirrors can be found [here](https://gitlab.com/snippets/2168) and [here](https://gist.github.com/maxlazio/f1b593b0d00aa966e9ca). + +## Contribute to this guide +We welcome all contributions that would expand this guide with instructions on how to migrate from other version control systems. From adb64dc2ee32b23cbbf7b1d9eed59cf4f72c4e63 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 15 Oct 2014 11:37:49 +0200 Subject: [PATCH 2/4] Clearer what to contribute. --- doc/workflow/migrating_from_svn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/workflow/migrating_from_svn.md b/doc/workflow/migrating_from_svn.md index 7ff157f482e..bdcb622f979 100644 --- a/doc/workflow/migrating_from_svn.md +++ b/doc/workflow/migrating_from_svn.md @@ -14,4 +14,4 @@ user created step by step guide for migrating from SVN to GitLab. [Benjamin New](https://github.com/leftclickben) wrote [a guide that shows how to do a migration](https://gist.github.com/leftclickben/322b7a3042cbe97ed2af). Mirrors can be found [here](https://gitlab.com/snippets/2168) and [here](https://gist.github.com/maxlazio/f1b593b0d00aa966e9ca). ## Contribute to this guide -We welcome all contributions that would expand this guide with instructions on how to migrate from other version control systems. +We welcome all contributions that would expand this guide with instructions on how to migrate from SVN and other version control systems. From 2803d9e0257c08107db5cebb9a5b10b87d6ca358 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 15 Oct 2014 12:53:06 +0200 Subject: [PATCH 3/4] Git is a distributed vcs. --- doc/workflow/migrating_from_svn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/workflow/migrating_from_svn.md b/doc/workflow/migrating_from_svn.md index bdcb622f979..207e3641802 100644 --- a/doc/workflow/migrating_from_svn.md +++ b/doc/workflow/migrating_from_svn.md @@ -1,7 +1,7 @@ # Migrating from SVN to GitLab SVN stands for Subversion and is a version control system (VCS). -Git is a distributed revision control and source code management (SCM) system. +Git is a distributed version control system. There are some major differences between the two, for more information consult your favourite search engine. From 76cde5c0e534e59c7dcd8bc7e096cfb0bf9f2603 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 15 Oct 2014 13:13:42 +0200 Subject: [PATCH 4/4] Add links to the migration doc, make it clear import is only for git repos. --- app/views/projects/import.html.haml | 3 ++- app/views/projects/new.html.haml | 3 ++- doc/workflow/README.md | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/projects/import.html.haml b/app/views/projects/import.html.haml index 1f7fd26c646..4513c89e784 100644 --- a/app/views/projects/import.html.haml +++ b/app/views/projects/import.html.haml @@ -19,12 +19,13 @@ = form_for @project, url: retry_import_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f| .form-group.import-url-data = f.label :import_url, class: 'control-label' do - %span Import existing repo + %span Import existing git repo .col-sm-10 = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' .bs-callout.bs-callout-info This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git. %br The import will time out after 4 minutes. For big repositories, use a clone/push combination. + For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"} .form-actions = f.submit 'Retry import', class: "btn btn-create", tabindex: 4 diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 6c986050c45..f5cd0f21e01 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -44,13 +44,14 @@ .js-toggle-content.hide .form-group.import-url-data = f.label :import_url, class: 'control-label' do - %span Import existing repo + %span Import existing git repo .col-sm-10 = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' .bs-callout.bs-callout-info This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git. %br The import will time out after 4 minutes. For big repositories, use a clone/push combination. + For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"} %hr .form-group diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 323ee48f3bc..c9768a98033 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -4,3 +4,4 @@ - [Groups](groups.md) - [Labels](labels.md) - [GitLab Flow](gitlab_flow.md) +- [Migrating from SVN to GitLab](migrating_from_svn.md)