Re: [ft-devel] conversion from cvs repository to git

[Werner LEMBERG]

> The result of my excersize is available from:
>
> http://gyvern.ipc.hiroshima-u.ac.jp/~mpsuzuki/dot-git_freetype-savannah.tar.bz2
>
> (about 30M)

Very nice!  However, I prefer to have only two git repositories,
namely for `freetype2' and `ft2demos'.  The other projects are no
longer maintained, and I think it's not necessary to convert them to
git.  Can you change this accordingly?

After this has been done it would be helpful to clean up the most
recent commit messages so that the first line (what you see in `gitk',
for example) becomes more comprehensible.  Normally, it's not possible
to change commit messages in git, but since this git repository hasn't
been made public yet, the following method works.  [Note that below I
use SHA ID numbers from the current git which will probably change if
we have smaller, separate git repositories.]

  Let's assume that we are going to fix the commit messages starting
  with release 2.3.0.  The corresponding git entry is

    6cd7062 *** empty log message ***

  dated 2007-01-17, which can be easily found out with `gitk'.
  However, we want to include this fix also, so we need one commit
  before, which is

    447cc6c Whitespace and spelling fixes from Alexei.

  0. Unpack the tarball in a separate directory.

  1. Create a series of patches using

       git format-patch 447cc6c..HEAD

     With Suzuki-san's git repository this call produces 480 files.

  2. Reset the repository to this state, removing all newer changes:

       git reset --hard 447cc6c

     This also checks out all files from the index.

  3. The first patch file, `0001-empty-log-message.patch', looks like
     this:

       From 6cd7062d1802b65707d570366cd19d7eb004f382 Mon Sep 17 00:00:00 2001
       From: wl <wl>
       Date: Wed, 17 Jan 2007 12:56:25 +0000
       Subject: [PATCH] *** empty log message ***

       ---
        freetype2/ChangeLog |    9 +++++++++
        ft2demos/ChangeLog  |    9 +++++++++
        2 files changed, 18 insertions(+), 0 deletions(-)

       ...

     Change the `Subject' line to

       From 6cd7062d1802b65707d570366cd19d7eb004f382 Mon Sep 17 00:00:00 2001
       From: wl <wl>
       Date: Wed, 17 Jan 2007 12:56:25 +0000
       Subject: [PATCH] Version 2.3.0 released.

       ---
        freetype2/ChangeLog |    9 +++++++++
        ft2demos/ChangeLog  |    9 +++++++++
        2 files changed, 18 insertions(+), 0 deletions(-)

       ...

     Do similar actions for all other patch files.

  4. Re-apply all patch files to the git:

      git am --whitespace=nowarn *.patch


  Werner