SubGit

Space shortcuts

Page tree

Versions Compared

Old Version 20

changes.mady.by.user Ildar Khusainov

Saved on

compared with

New Version 21

changes.mady.by.user Ildar Khusainov

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
  1. Install SubGit tool according to the Installation guide.

  2. Configure GitHub

    • login to GitHub and create a new repository:


     
  3. Configure local repository:

    Run this command on behalf of the same user you use to serve Git repository:

    No Format
    $ subgit configure --layout auto --trunk trunk SVN_URL GIT_REPO

    where

    • SVN_URL    – URL to the SVN project.
    • GIT_REPO  – a path to the new Git repository where data from the SVN project will be imported to.

    • TRUNK        –  a path, relative to SVN_URL, that leads to an SVN directory that plays a role of the main line of development.
       

      Expand
      titlesee the configuration command example.
      Code Block
      languagetext
      themeFadeToGrey
      titlesubgit configure example
      $ subgit configure --layout auto --trunk trunk http://svn.example.com/svn/repository/project ./project.git

            SubGit version 3.2.4 ('Bobique') build #3670

            Configuring writable Git mirror of remote Subversion repository:
                Subversion repository URL : http://svn.example.com/svn/repository/project
                Git repository location   : ./project.git

            Git repository is served by GitLab, hooks will be installed into 'custom_hooks' directory.

            Detecting peg location...
            Authentication realm: <http://svn.example.com/:80> Subversion Repository
            Username [git]: user
            Password for 'user':
            Peg location detected: r10248 project/trunk
            Fetching SVN history... Done.
            Growing trees... Done.
            Project origin detected: r1 project/trunk
            Building branches layouts... Done.
            Combing beards... Done.
            Generating SVN to Git mapping... Done.

            CONFIGURATION SUCCESSFUL

            To complete SubGit installation do the following:

            1) Adjust Subversion to Git branches mapping if necessary:
                /var/opt/gitlab/git-data/repositories/user/project.git/subgit/config
            2) Define at least one Subversion credentials in default SubGit passwd file at:
                /var/opt/gitlab/git-data/repositories/user/project.git/subgit/passwd
               OR configure SSH or SSL credentials in the [auth] section of:
                /var/opt/gitlab/git-data/repositories/user/project.git/subgit/config
            3) Optionally, add custom authors mapping to the authors.txt file(s) at:
                /var/opt/gitlab/git-data/repositories/user/project.git/subgit/authors.txt
            4) Run SubGit 'install' command:
                subgit install ./project.git

    • Specify authors mapping
      Configure authors mapping in default authors mapping file:

      No Format
      GIT_REPOS/subgit/authors.txt


      Or change core.authors option so that it points to the global authors mapping file.

      Find more details about authors mapping in Authors mapping article.


  4. Import data into local Git repository by the command:

    No Format
    $ subgit import GIT_REPO

    where 

        GIT_REPO – a path to the Git repository.
     

    Expand
    titleSee subgit import example…
    Code Block
    languagetext
    themeFadeToGrey
    titlesubgit import
    $ subgit import ./project.git

     SubGit version 3.2.4 ('Bobique') build #3670

     Authentication realm: <http://svn.example.com:80> Subversion Repository
      Username [git]: user
      Password for 'user': 

      Translating Subversion revisions to Git commits...

         Subversion revisions translated: 10248.
         Total time: 2 hours 15 minutes 38 seconds.

      IMPORT SUCCESSFUL
  5. Sync local Git repository with GitHub:

    • step into newly created local Git repository 

      No Format
      $ cd GIT_REPO

    • add a remote to the local Git repository:

      No Format
      $ git remote add github GITHUB_REPO

      where 

      • GITHUB_REPO – GitHub project URL.


    • push local repository content into GitHub repository:

      Expand
      titleSee git push command…
      Code Block
      languagetext
      themeFadeToGrey
      titlegit push
      $ git push github --all --follow-tags

    • When the command completed, all the files are  the local repository is not needed anymore and can be removed:

      No Format
      $ rm -Rf GIT_REPO

  6. All the files from SVN are now on GitHub, so you can clone your GitHub repository and start to work with it:

    No Format
    $ git clone GITHUB_REPO WORK_TREE

    where

    • WORK_TREE – a path to your working copy.
    • GITHUB_REPO – GitHub project URL


    Expand
    titleSee git clone example
    Code Block
    languagetext
    themeFadeToGrey
    titlegit clone example
    $ git clone https://github.com/user/project.git ./project.git
     Cloning into './project.git'...
     Password for 'http://user@example.com': 
     remote: Counting objects: 99, done.
     remote: Compressing objects: 100% (39/39), done.
     remote: Total 99 (delta 50), reused 99 (delta 50)
     Unpacking objects: 100% (99/99), done.
    Warning
    titleEmpty working tree case

    If Git warns you that you are cloning an empty repository and you don't see your files in the working tree, most probably automatic branches and tags mapping didn't work correctly. In this case, mapping has to be set manually, see details on mapping in Branches and tags mapping.

  7. Get support.

    Have you faced with any problems, see the following guide for more details:

     

...