tag:blogger.com,1999:blog-876358347971598886.post6437609612361589747..comments2023-03-25T16:20:46.021+03:00Comments on nothingmuch's perl blog: Migrating from Subversion to Gitnothingmuchhttp://www.blogger.com/profile/03855760206940108541noreply@blogger.comBlogger11125tag:blogger.com,1999:blog-876358347971598886.post-17718544621612157652010-01-06T20:22:03.113+02:002010-01-06T20:22:03.113+02:00regarding grafting, what should be in the file if ...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?szabgabhttps://www.blogger.com/profile/06240863335473730779noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-32645387170408986222009-10-21T15:25:29.294+02:002009-10-21T15:25:29.294+02:00@SamV
Fantastic! Thank you very much. Works like...@SamV<br /><br />Fantastic! Thank you very much. Works like a charm.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-47067005478561686102009-10-20T04:54:29.123+02:002009-10-20T04:54:29.123+02:00Mina, you are correct - and given that there are q...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.<br /><br /><a href="http://github.com/samv/git/commits/svk-merge" rel="nofollow">Enjoy</a>SamVhttps://www.blogger.com/profile/15104557254324587099noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-19208139487156148582009-10-20T00:50:17.117+02:002009-10-20T00:50:17.117+02:00Eep, thanks for the correction, I will update the ...Eep, thanks for the correction, I will update the post.<br /><br />What did you end up doing?nothingmuchhttps://www.blogger.com/profile/03975438115490089158noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-11426909671793292832009-10-19T22:47:44.747+02:002009-10-19T22:47:44.747+02:00Hi
I'm converting an SVN repo to GIT, and am ...Hi<br /><br />I'm converting an SVN repo to GIT, and am suffering from the problem of merges.<br /><br />Specifically, a "merge" done in SVN appears as a normal commit in git (single parent, not multiple parents as it should be).<br /><br />From the article, I assumed that using samv's fork of git fixes this issue, however that is not so.<br /><br />It appears that samv's fork only fixes the issue if the svn project used either svnmerge.py or SVK as merge helpers.<br /><br />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).<br /><br />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.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-26523100774541458112009-10-07T13:24:32.430+02:002009-10-07T13:24:32.430+02:00Fixed, thanks =)Fixed, thanks =)nothingmuchhttps://www.blogger.com/profile/03975438115490089158noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-64807070763660687002009-10-07T09:23:38.654+02:002009-10-07T09:23:38.654+02:00Hi there,
Thanks for the great post!
This snipp...Hi there,<br /><br />Thanks for the great post! <br /><br />This snippet may need reworking, tho: <i>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.</i><br /><br />Regards, Nubanubahttps://www.blogger.com/profile/14702109121680613383noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-2732250894667283602009-10-04T19:33:45.551+02:002009-10-04T19:33:45.551+02:00Useful ! Thanks!Useful ! Thanks!Arrakeenhttps://www.blogger.com/profile/05514217676033260267noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-66931680010194529652009-08-05T18:45:24.979+03:002009-08-05T18:45:24.979+03:00HI,
I've added a bit more info to the README,...HI,<br /><br />I've added a bit more info to the README, I hope that clears it up.<br /><br />Thanksnothingmuchhttps://www.blogger.com/profile/03975438115490089158noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-34483830659705499072009-08-05T13:16:39.052+03:002009-08-05T13:16:39.052+03:00git svn-abandon-cleanup isn't a git command. ...git svn-abandon-cleanup isn't a git command. I assume you need to install something from here :<br /><br />http://github.com/nothingmuch/git-svn-abandon/tree/master<br /><br />Unfortunately the README doesn't explain how you go about doing this.Unknownhttps://www.blogger.com/profile/04394189069134424003noreply@blogger.comtag:blogger.com,1999:blog-876358347971598886.post-61778762859967336872009-06-12T12:48:07.298+03:002009-06-12T12:48:07.298+03:00I just realized the assumption that you're usi...I just realized the assumption that you're using a proper authors file seemed so obvious to me that I neglected to mention it ;-)<br /><br />You have been warned, If I see svnuser@uuid I will mock you on the internet!nothingmuchhttps://www.blogger.com/profile/03975438115490089158noreply@blogger.com