Re: migrating Mifos from svn to git

From: Ulrich Spörlein <uqs@spoerlein.net>
Date: May 2, 2010, 08:25 UTC
Message-ID: <20100502082503.GG92627@acme.spoerlein.net>
In-Reply-To: <1272751725.21622.57.camel@scraps>

On Sat, 01.05.2010 at 15:08:45 -0700, Adam Monsen wrote:

Show 8 quoted lines

> 1. Is anyone willing to help me migrate Mifos from svn to git? If so,
> please contact me on or off list, or in #mifos or #git on FreeNode IRC
> (my nickname is "meonkeys"). It's for a good cause: our vision is to end
> world poverty!
> 
> 2. I'm trying out git-svn (a) to get used to git and (b) to actually try
> migrating our svn repo to a git repo. Is there a better way? (cbreak in
> #git seemed to think so)

svn2git is faster and can cope with multiple branches better, but it has bugs of its own. Try both of them ...

> 3. When using git-svn, can I first "init"/"git svn fetch" from a local
> mirror ( file:///opt/mifos_mirror ), then switch to our real repository
> ( https://mifos.svn.sourceforge.net/svnroot/mifos ) once I'm mostly up
> to date?

Yes, if both repos have the same UUID this should be possible. You need to fudge this in rev 0 and uuid in your svn mirror.

Show 8 quoted lines

> 4. When using git-svn, "git svn init" works against my local mirror, but
> "git svn fetch" dies on svn revision 16072
> ( http://article.gmane.org/gmane.comp.finance.mifos.scm/6053 ). Can I
> maybe just skip that changeset ....nevermind, "git svn fetch
> --ignore-paths=branches/removeFinancialActionCache" seemed to do the
> trick. Hrm, now I'm stuck at some other commit. Anyway, thanks for
> enduring this ramble. Here's the latest problem I'm running into, in
> case anyone has ideas on what Fu I might use to get out of this hole:

If stuff has been merged from/to those ignored branches, you'll get into trouble later on. So ignoring them altogether doesn't seem like a good plan.

I was only lucky in using git-svn when converting trunk only, or some selected branches where merging is/was done *always* from trunk -> branchXY

hth Uli