Bureaucrats, confirmed, Administrators
4,558
edits
Changes
no edit summary
== Advantages ==
What are the advantages of Git over SVN (especially in the area of merging)?
Here is a short list. A fuller [https://git.wiki.kernel.org/index.php/GitSvnComparison Git v. Subversion Comparison is at kernel.org]
# Git isn't (just) 'smarter' meaning the devs figured out better algorithms. It's completely different. It can be said that SVN is multi-user only because they took an approach that works for a single user, and added features to "multiply" it. Sort of like the Windows operating system. On Windows, you have to log out to have another user log in. Git is multi-user the way that Linux is multi-user: it's built that way from the ground up.
# branch is virtual in svn v. first class object in git
But the real migration is harder than that.
* user migration/mapping <code>svn log --xml | grep author | sort -u | perl -pe 's/.*>(.*?)<.*/$1 = /' > users.txt</code>
* <code>git svn clone --stdlayout --no-metadata --authors-file=users.txt file:///path-to/svn-repo tmp-git-repo</code>* <code>git checkout -b local_branch remote_branch</code>
* migrate tags
== Overview of the trial project ==
One potential trial would be to setup GitLab Development Kit, either on bare metal, or using vagrant https://gitlab.com/gitlab-org/gitlab-development-kit
== Define the trial project along with milestones ==