Git migration

This is an old revision of Git migration, edited by Ggeldenhuys at . The current revision is 124538.

/* A successful Git branching model */

This page is about migrating FPC from SVN to git

Concerns/Questions

What part of SVN to migrate ?

Use git clone --depth 1 to get only the latest revision (with fetch, later on more revisions can be fetched if needed)

Build repository

The fpc build repository uses svn:external references.

Git has modules, which is in essence the same. This needs to be properly set up.

Branching model ?

Various workflow models exist:

A successful Git branching model

Also known as "git-flow" model.

The cactus model

Also known as the anti-"A successful Git branching Model".

See the Git project itself

User management ?

Git has no concept of users. To manage permissions on a server, a separate program is needed.

gitorious

gitea

What about Lazarus ?

Tool for migration

subgit

Advantages

Disadvantages

git-svn

Advantages

Disadvantages

Work to do

Migrate SVN repo.

Branch mapping for subgit

Proposal for branch mapping

excludeBranches = branches/aspect
excludeBranches = branches/avr32
excludeBranches = branches/blaise
excludeBranches = branches/cpstr
excludeBranches = branches/cpstrnew
excludeBranches = branches/ctypes
excludeBranches = branches/dodi
excludeBranches = branches/florian
excludeBranches = branches/foxsen
excludeBranches = branches/fcl-web_joost
excludeBranches = branches/generics
excludeBranches = branches/genfunc
excludeBranches = branches/janbruns
excludeBranches = branches/linker
excludeBranches = branches/newthreading
excludeBranches = branches/peterjan
excludeBranches = branches/ssa
excludeBranches = branches/tg74/rtl
excludeBranches = branches/tg74/tests
excludeBranches = branches/tg74/utils
excludeBranches = branches/unitrw
excludeBranches = branches/wkrenn
excludeBranches = branches/FIXES_2_2

branches = branches/merged/*:refs/heads/merged/*
branches = branches/joost/*:refs/heads/joost/*
branches = branches/laksen/*:refs/heads/laksen/*
branches = branches/maciej/*:refs/heads/maciej/*
branches = branches/olivier/*:refs/heads/olivier/*
branches = branches/paul/*:refs/heads/paul/*
branches = branches/*:refs/heads/svn/*
branches = branches/svenbarth/*:refs/heads/svenbarth/*
branches = branches/tg74/*:refs/heads/tg74/*

Set up user management and permissions.

Set up and automate github mirror