SVN vs. git, status update

[Andy Green]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Somebody in the thread at some point said:

> that should be easy but the problem is setting correct commit messages,
> from
> Andy tree I can see a lot of wrong names, missing Signed-off-by and null
> commit messages, that should be unacceptable after switching to git.

It's already unacceptable, but all that wrongness is in the mokopatches.
 Every patch I have on top -- the actual "andy" branch -- is always
correctly attributed and has the patch name as the first line of the commit.

> well, git rebase would be a way, the problem is that git rebase rewrites
> git history
> and if you wanna keep this patches published you have to delete remote
> branch and git push
> it again after git rebase.
> 
> If nobody wanna do this dirty job I could help integrating patches into a
> clean git tree and
> keeping it up to date with mainline.
> 
> We could start defining merge schedules, for now it could be every week or
> when something really big
> should be taken care of.

I think it is great you offer to help on this, but make sure you
understand the current strange situation.  Due to never getting anything
upstream, there is 18 months of backed-up patches all squashed into
metapatches that you can see in the "mokopatches" branch in git.  These
come out of svn as-is and I build on top of them in the "andy" branch in
git.

Right now if you propose a patch or patchset here, the process is to rip
up your patches (destroying any patchset structure) and distribute them
between the dozens of "mokopatches" topic patches, tearing off the
attribution and commit messages into svn somewhere along the way.  But
somewhere over that time, it became clear that the topic metapatches
themselves are not in an acceptable state for proposal upstream directly
and themselves need rework.  But this doesn't happen.  So we just go on
hopelessly trashing patches to add to these huge dungballs.

This is the actual task at hand that is the "dirty job", refactoring 18
months of flattened metapatches and getting them upstream.  Actually
running the git trees once that is done will be relatively simple.

But if you still want to do it, Werner will be overjoyed I should think :-)

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFH1maVOjLpvpq7dMoRAnsCAJ4hLZ394ddPb8q+8p52lZqPKRN0XwCeKAfv
uGAaM8DlGAH6ZYR25379nU8=
=dqHP
-----END PGP SIGNATURE-----