Subtle bug, simple fix. The problem was introduced by my change that used content hashes to avoid issuing duplicate blobs. The generated .gitignore nodes didn't have a Content-Hash header, which meant all .gitignores were treated as though they had the same *empty* hash. 2.0pre8 is at: http://www.catb.org/esr/nut-conversion/nut-conversion.tar.gz Please check that the .gitignores look OK when you generate them. I've updated my mirror to r3395 and fixed up comments. Now I'll go back to work onn getting two-parent commits right, or at least matching what git-svn does, # Known problems: # 1. Merge code isn't working. # 2. The first Eaton_SDK commit after the deleteall should have a link # back to trunk. The commit "Moving branches/Development into trunk." # (2006-02-16T13:31:43Z!clepple+nut at gmail.com) is a deleteall in # reposurgeon's translation, but in the git-svn conversion and original SVN # repository that commit is a no-op (file-wise) that connects/renames the # old branches/Development with the new trunk. Both instances of a general # problem: I don't have rules for when I should be generating merge # commits. 2 is partially solved. -- <a href="http://www.catb.org/~esr/">Eric S. Raymond</a> "Gun control" is a job-safety program for criminals.
On Jan 11, 2012, at 4:48 PM, Eric S. Raymond wrote:> Please check that the .gitignores look OK when you generate them.They look good - thanks for fixing that. As mentioned when I was attempting to merge branches, a few other files seem to be missing in the output repository. I ran something like this in the git-svn working copy, and also in the 2.0-pre8 output: $ find . -name .git -prune -o -type f |sort|fgrep -v /.gitignore And when I diff the two listings, I get the attached file. reposurgeon's -pre4 and -pre8 versions omit the same files. I should have a little time later tonight to look at the fast-import stream, but nothing jumps out at me. Some files, such as clients/cgilib.h, have been unchanged since the CVS import. Others have undergone a few revisions. -- Charles Lepple clepple at gmail -------------- next part -------------- A non-text attachment was scrubbed... Name: missing-files.diff.gz Type: application/x-gzip Size: 1229 bytes Desc: not available URL: <http://lists.alioth.debian.org/pipermail/nut-upsdev/attachments/20120111/a51f99c5/attachment.bin>