Comments on nothingmuch's perl blog: Migrating from Subversion to Git

regarding grafting, what should be in the file if ...

2010-01-06T20:22:03.113+02:00

regarding grafting, what should be in the file if I have 1 the original file 2 is the first change on the branch then there are several changes on both the branch and the trunk and 10 is the merged revision?

@SamV Fantastic! Thank you very much. Works like...

2009-10-21T15:25:29.510+02:00

@SamV

Fantastic! Thank you very much. Works like a charm.

Mina, you are correct - and given that there are q...

2009-10-20T04:54:29.374+02:00

Mina, you are correct - and given that there are quite a few projects now using the SVN 1.5+ merge support, I guess it's worth fixing.

Enjoy

Eep, thanks for the correction, I will update the ...

2009-10-20T00:50:17.465+02:00

Eep, thanks for the correction, I will update the post.

What did you end up doing?

Hi I'm converting an SVN repo to GIT, and am suff...

2009-10-19T22:47:45.074+02:00

Hi

I'm converting an SVN repo to GIT, and am suffering from the problem of merges.

Specifically, a "merge" done in SVN appears as a normal commit in git (single parent, not multiple parents as it should be).

From the article, I assumed that using samv's fork of git fixes this issue, however that is not so.

It appears that samv's fork only fixes the issue if the svn project used either svnmerge.py or SVK as merge helpers.

Merges done with vanilla svn, even 1.5+ which includes svn:mergeinfo metadata, are not handled by samv's fork (or any other fork/patch that I've seen).

It took me a couple of hours to conclude this, specifically since samv's fork appears to have tests that mention "mergeinfo", but not actual code to handle that case.

Fixed, thanks =)

2009-10-07T13:24:32.602+02:00

Fixed, thanks =)

Hi there, Thanks for the great post! This snipp...

2009-10-07T09:23:38.869+02:00

Hi there,

Thanks for the great post!

This snippet may need reworking, tho: You can still cleanly import a repository does not follow the standard directory layout or has other complications (e.g. the repository was moved without importing) you can still.

Regards, Nuba

Useful ! Thanks!

2009-10-04T19:33:46.174+02:00

Useful ! Thanks!

HI, I've added a bit more info to the README, I h...

2009-08-05T18:45:24.979+03:00

HI,

I've added a bit more info to the README, I hope that clears it up.

Thanks

git svn-abandon-cleanup isn't a git command. I as...

2009-08-05T13:16:39.052+03:00

git svn-abandon-cleanup isn't a git command. I assume you need to install something from here :

http://github.com/nothingmuch/git-svn-abandon/tree/master

Unfortunately the README doesn't explain how you go about doing this.

I just realized the assumption that you're using a...

2009-06-12T12:48:07.298+03:00

I just realized the assumption that you're using a proper authors file seemed so obvious to me that I neglected to mention it ;-)

You have been warned, If I see svnuser@uuid I will mock you on the internet!