** history of patch-o-matic-ng svn tree At the revision 1, patch-o-matic-ng was commited to patch-o-matic-ng/trunk. At the revision 3079, it was moved to trunk/patch-o-matic-ng. At the revision 4007, trunk/patch-o-matic-ng-2 was created. At 4008, mkdir trunk/patch-o-matic-ng-2/patchlets At 4009, mv trunk/patch-o-matic-ng \ trunk/patch-o-matic-ng-2/patchlets/patch-o-matic-ng At 4010, mv trunk/patch-o-matic-ng-2/patchlets/patch-o-matic-ng \ trunk/patch-o-matic-ng-2/patchlets2 At 4011, rm -rf trunk/patch-o-matic-ng-2/patchlets At 4012, mv trunk/patch-o-matic-ng-2/patchlets2 \ trunk/patch-o-matic-ng-2/patchlets Well, that is, changes from 4008 to 4012 are same as mv trunk/patch-o-matic-ng trunk/patch-o-matic-ng-2/patchlets At 4013, mv trunk/patch-o-matic-ng-2/patchlets/runme \ trunk/patch-o-matic-ng-2/runme At 4014, mv trunk/patch-o-matic-ng-2/patchlets/Netfilter_POM.pm \ trunk/patch-o-matic-ng-2/Netfilter_POM.pm At 4015, mv trunk/patch-o-matic-ng-2/patchlets/config \ trunk/patch-o-matic-ng-2/config At 4016, mv trunk/patch-o-matic-ng-2/patchlets/README \ trunk/patch-o-matic-ng-2/README At 4017, mv trunk/patch-o-matic-ng-2/patchlets/README.newpatches \ trunk/patch-o-matic-ng-2/README.newpatches At 4018, rm -rf trunk/patch-o-matic-ng, and mv trunk/patch-o-matic-ng-2 trunk/patch-o-matic-ng ** import log $ git-svnimport -v -l 3079 -T patch-o-matic-ng/trunk -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter Failed at 1519 after processing 519. There is no difference between the revision 519 and 1519. So $ git-svnimport -v -s 1519 -l 3079 -T patch-o-matic-ng/trunk -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter Nothing was merged, and failed at 3079. Next, I changed the source directory to import changes from the revision 3080. $ git-svnimport -v -s 3080 -l 4006 -T trunk/patch-o-matic-ng -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter Suceeded. Grrr. but it could not cleanly import the change of 3601. patch-o-matic-ng/h323-conntrack-nat/linux-2.6/Documentation/Configure.help.ladd was not deleted. So I fixed up it as follows. git-checkout origin git-reset --hard (commit ID for svn revision 3601) git-format-patch -k HEAD^ vi 0001-* I deleted Configure.help.ladd from the patch git-reset --hard HEAD^ git-am -k 0001-* git-checkout master git-reset --hard origin vi .git/svn2git.txt I deleted the maps from 3061 to 3079 and append the following. 3601 / 6f33aecc161365c9b19ddae97a3fcedb09d2ad5b And the commit from 3752 to 3755, 3831, and 3957 had same problem. So I fixed up them by my hand. Next, $ git-svnimport -v -l 4006 -T trunk/patch-o-matic-ng -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter Next, to import changes to directory structure from the revision 4008 to 4018, I manually changed git tree as follows. git-checkout -f origin mkdir patchlets mv * patchlets/ git-add patchlets git-commit -a git-checkout master git-reset --hard origin echo '4012 / 2716af3014077d3efabdf87332292f1433c9f6cd' \ >> .git/svn2git.txt Note: I added a new commit log instead of the original ones. As a result, git tree had been synchronized with the revision 4012 of trunk/patch-o-matic-ng-2. Next, I imported changes from 4013 to 4017 on trunk/patch-o-matic-ng-2 as follows. $ git-svnimport -v -s 4012 -l 4017 -T trunk/patch-o-matic-ng-2 -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter Next, I changed the source directory to import changes from 4019 on trunk/patch-o-matic-ng as follows. $ git-svnimport -v -s 4017 -T trunk/patch-o-matic-ng -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter It failed at 5276. The commits from 5276 to 6275 were This is an empty revision for padding. Then, $ git-svnimport -v -s 6275 -T trunk/patch-o-matic-ng -b dummy_branches -t dummy_tags http://svn.netfilter.org/netfilter