[freeciv-dev] Re: Git migration

From: Jacob Nevins <0jacobnk.fcdev@xxxxxxxxxxxxxxxxxxxxxx>
To: freeciv-dev@xxxxxxxxxxxxx, freeciv-i18n@xxxxxxxxxxxxx
Date: Mon, 19 Jun 2017 11:00:59 +0100

In April, I wrote:

With Gna shutting down, we intend to migrate the official source
repository from Subversion to Git. (Currently we expect to host the
result on Github.)

As I expect people have noticed, Gna shut down on 24 May, and no-one's
been able to commit to or view an official source repository since.
Sorry for the lack of communication on this.

We did rescue all the commits that were made to Subversion (thanks to
Sveinung).

I've been working on the Git migration, and I at last I have something
to show you. A PREVIEW of the git conversion is temporarily available
at:
git clone
https://tartarus.org/jacob/junk/freeciv/git/20170618_git_prelim/freeciv.git
git clone
https://tartarus.org/jacob/junk/freeciv/git/20170618_git_prelim/freeciv-website.git

**************************************
** THIS IS NOT THE OFFICIAL HISTORY **
**************************************

The hashes in the final conversion *will* differ (because there is a
notice to this effect in the root commit). The URL will go offline at
some point, too.

Conversion notes are in the root commit. Various conversion notes are
also scattered through the repository. Some points of interest
( / opportunities to spot bugs):
- cvs2svn confusion between 'freeciv153' and 'freeciv154' (see r2)
- move of files from common/ to utility/ r7547
- tags off S1_14/S2_0 (which were all pretty broken in views of svn)
- migration from CVS to SVN r11102
- trunk abandonment around S2_2, see tag 'trunk-abandoned-20081024'

This is mainly intended for review. Please do look at it, and if
anything looks wrong or not as you remember, do tell me; once we start
developing against a Git history it will be too late to change.

It's 262M. For comparison, the Subversion repo was 2.9G. I don't have
anywhere to put the Subversion repo online in convenient form for
comparison, but I've dumped it at <http://files.freeciv.org/dev/svn/repo/>
so that anyone sufficiently motivated can mirror it and point Subversion
at it locally (with URLs like file:///home/jtn/freeciv/svn/repo/...)

My vague plan is to re-run the conversion and upload it to Github next
weekend (24-25 June), if no-one spots anything wrong.

You can start developing in clones of this if you like, but be prepared
to transfer your commits to the official history when it turns up; and
if you're not confident with git it might be better to wait. (I fear it
would be easy to accidentally try to push two decades of bogus alternate
history to the official repo alongside your changes.)

Once the official history is online, we'll still have to work out what
kind of workflow we use; this might take a bit longer, sorry. My vague
plan is to start out with a Subversion-like workflow (no merge commits,
etc) and go from there.

If you have a preference as to how your commits will appear, please let
me know, including your svn/CVS user ID.

This is the last chance to affect this.

Thanks for your patience,
Jacob

[freeciv-dev] Re: Git migration

Other related posts: