{"thread":{"id":"4923","subject":"git-svn: Missing files","startedAt":"2006-07-20T02:02:38Z","lastAt":"2006-07-24T06:42:38Z","messageCount":9,"participants":["Ben Williamson","Eric Wong","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23938","messageId":"b6327a230607191902n47b81993x8caea2df3955d8c0@mail.gmail.com","threadId":"4923","inReplyTo":null,"subject":"git-svn: Missing files","fromName":"Ben Williamson","fromEmail":"benw@pobox.com","sentAt":"2006-07-20T02:02:38Z","receivedAt":"2006-07-20T02:02:38Z","isPatch":false,"sender":{"key":"benw@pobox.com","avatar":"https://gravatar.com/avatar/e08b68465386043da911bf45e1f631ba33a6198290470ee750437ddc2e724f73?d=mp&s=160"},"body":"Hi all,\n\nI'm probably confused, but it seems like git-svn has missed some files\nwhile importing the buildroot sources. I did this:\n\n git-svn init svn://uclibc.org/trunk/buildroot\n git-svn fetch\n\nThen I used gitk to find the revision corresponding to svn's r15711,\nand checked that out:\n\n git-checkout -b test c84f9463b67bdb57c93bec571b1118b37cb597ce\n\ncommit c84f9463b67bdb57c93bec571b1118b37cb597ce\nAuthor: vapier \nDate: Mon Jul 17 03:53:12 2006 +0000\n\n fix whitespace\n\n git-svn-id: svn://uclibc.org/trunk/buildroot@15711\n69ca8d6d-28ef-0310-b511-8ec308f3f277\n\nThe resulting tree is missing a bunch of files, compared to what I\nchecked out with svn:\n\n svn export -r15711 svn://uclibc.org/trunk/buildroot buildroot\n\nAlso, if I use git-svn to only fetch r15711 then I get what I expect,\nwith no missing files. The tree is the same as the 'svn export' minus\na few empty directories:\n\n git-svn init svn://uclibc.org/trunk/buildroot\n git-svn fetch -r15711\n\nI've listed the missing files below. There are no other differences -\nall the files that did turn up are identical in all three trees (\"svn\nexport\", \"git-svn fetch\" and \"git-svn fetch -r15711\").\n\nDisclaimer: I'm no subversion expert, and I'm fairly new to git. But\ngit rocks, and I'd love somewhere to locally commit my hacks to\nsubversion projects like buildroot.\n\nThanks!\n\n- Ben.\n\n\ndiff -ur --exclude .git svn-export/buildroot git-svn-fetch-all/buildroot\nOnly in svn-export/buildroot/package: linux\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n003_kbuild_fixes.diff.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n004_386_emu.diff.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n005_modularize_vesafb.diff.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n006_init_unshare.diff.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n008-ieee1394-fix.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n009-always-inline.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n010-optimize-for-size.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n012-x86-check_gcc.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n015_cramfs_initrd.diff.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n017-printk.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n018-slab-loop-init.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n041-changeloop.patch.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n042-loopfixes.patch.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n062-silence-blk-queue.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n063-silence.kbd.patch.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n064-shutup-md.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n076-nmap-freak.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n077-orinoco-0.13e.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n078-hostap.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n079-jiffies64.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n089-no-touch-makedep.bz2\nOnly in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n100_VERSION.bz2\nOnly in svn-export/buildroot/target/generic: access_point\nOnly in svn-export/buildroot/target/generic: firewall\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: fstab\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: hostname\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: hosts\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc/init.d: rcS\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc/init.d:\nS40network\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: inittab\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: inputrc\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: issue\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: network\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: passwd\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: profile\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: protocols\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: random-seed\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: securetty\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: services\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: shadow\nOnly in svn-export/buildroot/target/generic/target_skeleton/etc: TZ\nOnly in svn-export/buildroot/target/generic/target_skeleton: root\nOnly in svn-export/buildroot/target/generic/target_skeleton: usr\nOnly in svn-export/buildroot/toolchain/binutils: 2.16.91.0.6\nOnly in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n300-001_ld_makefile_patch.patch\nOnly in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n300-006_better_file_error.patch\nOnly in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n300-012_check_ldrunpath_length.patch\nOnly in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n400-mips-ELF_MAXPAGESIZE-4K.patch\nOnly in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n702-binutils-skip-comments.patch\nOnly in svn-export/buildroot/toolchain/binutils: 2.17\nOnly in svn-export/buildroot/toolchain/binutils: 2.17.50.0.2\nOnly in svn-export/buildroot/toolchain/binutils: 2.17.50.0.3\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 100-uclibc-conf.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 200-uclibc-locale.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 300-libstdc++-pic.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\n600-gcc34-arm-ldm-peephole.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 601-gcc34-arm-ldm.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\n601-gcc34-arm-ldm-peephole2.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\n602-sdk-libstdc++-includes.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 700-pr15068-fix.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 71_all_sh-pr16665-fix.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\n72_all_sh-no-reorder-blocks.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 73_all_sh-pr20617.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\n800-powerpc-libc_stack_end-uclibc.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6: 900-nios2.patch\nOnly in svn-export/buildroot/toolchain/gcc/3.4.6:\narm-softfloat.patch.conditional\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3: 100-uclibc-conf.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3: 200-uclibc-locale.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3: 300-libstdc++-pic.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3: 301-missing-execinfo_h.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3: 302-c99-snprintf.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3:\n303-c99-complex-ugly-hack.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.0.3:\n602-sdk-libstdc++-includes.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 100-uclibc-conf.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 301-missing-execinfo_h.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 302-c99-snprintf.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1:\n303-c99-complex-ugly-hack.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 304-index_macro.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 740-sh-pr24836.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.1.1: 800-arm-bigendian.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2: 103-uclibc-conf-noupstream.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2: 203-uclibc-locale-no__x.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2:\n204-uclibc-locale-wchar_fix.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2: 301-missing-execinfo_h.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2: 302-c99-snprintf.patch\nOnly in svn-export/buildroot/toolchain/gcc/4.2: 303-c99-complex-ugly-hack.patch\nOnly in svn-export/buildroot/toolchain/gdb: 6.5\n"},{"id":"23939","messageId":"b6327a230607191909tf48c4f8nc551b732523cca3e@mail.gmail.com","threadId":"4923","inReplyTo":"b6327a230607191902n47b81993x8caea2df3955d8c0@mail.gmail.com","subject":"Re: git-svn: Missing files","fromName":"Ben Williamson","fromEmail":"benw@pobox.com","sentAt":"2006-07-20T02:09:52Z","receivedAt":"2006-07-20T02:09:52Z","isPatch":false,"sender":{"key":"benw@pobox.com","avatar":"https://gravatar.com/avatar/e08b68465386043da911bf45e1f631ba33a6198290470ee750437ddc2e724f73?d=mp&s=160"},"body":"Oh. I just looked in git-svn and found this:\n\n$VERSION = '1.1.1-broken';\n\nFair enough. So far I haven't explored other branches in git.git, I've\nno idea what \"pu\" stands for. Can someone point me in the right\ndirection?\n\nThanks,\n\n- Ben.\n\n\nOn 7/20/06, Ben Williamson wrote:\n> Hi all,\n>\n> I'm probably confused, but it seems like git-svn has missed some files\n> while importing the buildroot sources. I did this:\n>\n> git-svn init svn://uclibc.org/trunk/buildroot\n> git-svn fetch\n>\n> Then I used gitk to find the revision corresponding to svn's r15711,\n> and checked that out:\n>\n> git-checkout -b test c84f9463b67bdb57c93bec571b1118b37cb597ce\n>\n> commit c84f9463b67bdb57c93bec571b1118b37cb597ce\n> Author: vapier \n> Date: Mon Jul 17 03:53:12 2006 +0000\n>\n> fix whitespace\n>\n> git-svn-id: svn://uclibc.org/trunk/buildroot@15711\n> 69ca8d6d-28ef-0310-b511-8ec308f3f277\n>\n> The resulting tree is missing a bunch of files, compared to what I\n> checked out with svn:\n>\n> svn export -r15711 svn://uclibc.org/trunk/buildroot buildroot\n>\n> Also, if I use git-svn to only fetch r15711 then I get what I expect,\n> with no missing files. The tree is the same as the 'svn export' minus\n> a few empty directories:\n>\n> git-svn init svn://uclibc.org/trunk/buildroot\n> git-svn fetch -r15711\n>\n> I've listed the missing files below. There are no other differences -\n> all the files that did turn up are identical in all three trees (\"svn\n> export\", \"git-svn fetch\" and \"git-svn fetch -r15711\").\n>\n> Disclaimer: I'm no subversion expert, and I'm fairly new to git. But\n> git rocks, and I'd love somewhere to locally commit my hacks to\n> subversion projects like buildroot.\n>\n> Thanks!\n>\n> - Ben.\n>\n>\n> diff -ur --exclude .git svn-export/buildroot git-svn-fetch-all/buildroot\n> Only in svn-export/buildroot/package: linux\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 003_kbuild_fixes.diff.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 004_386_emu.diff.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 005_modularize_vesafb.diff.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 006_init_unshare.diff.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 008-ieee1394-fix.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 009-always-inline.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 010-optimize-for-size.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 012-x86-check_gcc.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 015_cramfs_initrd.diff.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 017-printk.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 018-slab-loop-init.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 041-changeloop.patch.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 042-loopfixes.patch.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 062-silence-blk-queue.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 063-silence.kbd.patch.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 064-shutup-md.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 076-nmap-freak.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 077-orinoco-0.13e.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 078-hostap.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 079-jiffies64.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 089-no-touch-makedep.bz2\n> Only in svn-export/buildroot/target/device/Soekris/net4521/kernel-patches:\n> 100_VERSION.bz2\n> Only in svn-export/buildroot/target/generic: access_point\n> Only in svn-export/buildroot/target/generic: firewall\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: fstab\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: hostname\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: hosts\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc/init.d: rcS\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc/init.d:\n> S40network\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: inittab\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: inputrc\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: issue\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: network\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: passwd\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: profile\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: protocols\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: random-seed\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: securetty\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: services\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: shadow\n> Only in svn-export/buildroot/target/generic/target_skeleton/etc: TZ\n> Only in svn-export/buildroot/target/generic/target_skeleton: root\n> Only in svn-export/buildroot/target/generic/target_skeleton: usr\n> Only in svn-export/buildroot/toolchain/binutils: 2.16.91.0.6\n> Only in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n> 300-001_ld_makefile_patch.patch\n> Only in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n> 300-006_better_file_error.patch\n> Only in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n> 300-012_check_ldrunpath_length.patch\n> Only in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n> 400-mips-ELF_MAXPAGESIZE-4K.patch\n> Only in svn-export/buildroot/toolchain/binutils/2.16.91.0.7:\n> 702-binutils-skip-comments.patch\n> Only in svn-export/buildroot/toolchain/binutils: 2.17\n> Only in svn-export/buildroot/toolchain/binutils: 2.17.50.0.2\n> Only in svn-export/buildroot/toolchain/binutils: 2.17.50.0.3\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 100-uclibc-conf.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 200-uclibc-locale.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 300-libstdc++-pic.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> 600-gcc34-arm-ldm-peephole.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 601-gcc34-arm-ldm.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> 601-gcc34-arm-ldm-peephole2.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> 602-sdk-libstdc++-includes.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 700-pr15068-fix.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 71_all_sh-pr16665-fix.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> 72_all_sh-no-reorder-blocks.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 73_all_sh-pr20617.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> 800-powerpc-libc_stack_end-uclibc.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6: 900-nios2.patch\n> Only in svn-export/buildroot/toolchain/gcc/3.4.6:\n> arm-softfloat.patch.conditional\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3: 100-uclibc-conf.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3: 200-uclibc-locale.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3: 300-libstdc++-pic.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3: 301-missing-execinfo_h.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3: 302-c99-snprintf.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3:\n> 303-c99-complex-ugly-hack.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.0.3:\n> 602-sdk-libstdc++-includes.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 100-uclibc-conf.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 301-missing-execinfo_h.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 302-c99-snprintf.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1:\n> 303-c99-complex-ugly-hack.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 304-index_macro.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 740-sh-pr24836.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.1.1: 800-arm-bigendian.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2: 103-uclibc-conf-noupstream.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2: 203-uclibc-locale-no__x.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2:\n> 204-uclibc-locale-wchar_fix.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2: 301-missing-execinfo_h.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2: 302-c99-snprintf.patch\n> Only in svn-export/buildroot/toolchain/gcc/4.2: 303-c99-complex-ugly-hack.patch\n> Only in svn-export/buildroot/toolchain/gdb: 6.5\n>\n"},{"id":"23940","messageId":"20060720024815.GC31763@localdomain","threadId":"4923","inReplyTo":"b6327a230607191909tf48c4f8nc551b732523cca3e@mail.gmail.com","subject":"Re: git-svn: Missing files","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-07-20T02:48:15Z","receivedAt":"2006-07-20T02:48:15Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Ben Williamson wrote:\n> Oh. I just looked in git-svn and found this:\n> \n> $VERSION = '1.1.1-broken';\n\nI removed the version tag and started using GIT_VERSION when git-svn\nmoved out of contrib/ a few weeks ago.\n\nAs far as I remember, I don't remember git-svn having problems with\nmissing files. There has been a bug where it got extra files from other\nplaces in the repository, but that's fixed.\n\nMay I ask if you have the Perl SVN:: library bindings installed? If so\n1.1.1-broken (and all versions afterwards) will automatically. use them\n(if the SVN library version is >= 1.1).\n\nNevertheless, I'm running an import right now (with the SVN:: libraries enabled)\nand will make another run with them disabled (which is kind of slow).\nI'll keep you posted...\n\nI've actually been getting a lot of real-world git-svn usage in the past\nfew weeks (and hence the lack of git-related work) and haven't noticed\nany major problems.\n\n> Fair enough. So far I haven't explored other branches in git.git, I've\n> no idea what \"pu\" stands for. Can someone point me in the right\n> direction?\n\npu is \"potential updates\", it's very bleeding edge. next is a few steps\nahead of master, which should be the safest of the three.\n\n-- \nEric Wong\n"},{"id":"23941","messageId":"20060720030653.GA13741@localdomain","threadId":"4923","inReplyTo":"20060720024815.GC31763@localdomain","subject":"Re: git-svn: Missing files","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-07-20T03:06:54Z","receivedAt":"2006-07-20T03:06:54Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Eric Wong wrote:\n> Ben Williamson wrote:\n> > Oh. I just looked in git-svn and found this:\n> > \n> > $VERSION = '1.1.1-broken';\n> \n> Nevertheless, I'm running an import right now (with the SVN:: libraries enabled)\n> and will make another run with them disabled (which is kind of slow).\n> I'll keep you posted...\n\nOk, I think I've found the problem. This problem only happens if you're\nusing the SVN:: libraries, right?\n\n-- \nEric Wong\n"},{"id":"23942","messageId":"20060720034841.GA28298@localdomain","threadId":"4923","inReplyTo":"b6327a230607191902n47b81993x8caea2df3955d8c0@mail.gmail.com","subject":"[PATCH] Re: git-svn: Missing files","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-07-20T03:48:41Z","receivedAt":"2006-07-20T03:48:41Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Ben, can you please try this patch against the git-svn.perl file in\nmaster? You can also find the full patched file here:\n\n\thttp://git-svn.bogomips.org/git-svn.perl\n\nFrom: Eric Wong \nDate: Wed, 19 Jul 2006 20:42:35 -0700\nSubject: [PATCH] git-svn: fix fetching new directories copies when using SVN:: libs\n\nLog output from SVN doesn't list all the new files that were\nadded if a new directory was copied from an existing place in\nthe repository. This means we'll have to do some extra work and\ntraverse new directories ourselves.\n\nThanks to Ben Williamson for the excellent bug report.\n\nSigned-off-by: Eric Wong \n---\n git-svn.perl | 18 +++++++++++-------\n 1 files changed, 11 insertions(+), 7 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 89ad840..577a284 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -2692,6 +2692,7 @@ sub libsvn_fetch {\n \tmy ($last_commit, $paths, $rev, $author, $date, $msg) = @_;\n \topen my $gui, '| git-update-index -z --index-info' or croak $!;\n \tmy @amr;\n+\tmy %fetched = ();\n \tforeach my $f (keys %$paths) {\n \t\tmy $m = $paths->{$f}->action();\n \t\t$f =~ s#^/+##;\n@@ -2709,10 +2710,13 @@ sub libsvn_fetch {\n \t\t\t} else {\n \t\t\t\tdie \"Unrecognized action: $m, ($f r$rev)\\n\";\n \t\t\t}\n+\t\t} elsif ($t == $SVN::Node::dir && $m =~ /^[AR]$/) {\n+\t\t\tlibsvn_traverse($gui, '', $f, $rev, \\%fetched);\n \t\t}\n \t\t$pool->clear;\n \t}\n \tforeach (@amr) {\n+\t\tnext if $fetched{$_->[1]};\n \t\tprint \"\\t$_->[0]\\t$_->[1]\\n\" unless $_q;\n \t\tlibsvn_get_file($gui, $_->[1], $rev)\n \t}\n@@ -2778,7 +2782,7 @@ sub libsvn_parse_revision {\n }\n \n sub libsvn_traverse {\n-\tmy ($gui, $pfx, $path, $rev) = @_;\n+\tmy ($gui, $pfx, $path, $rev, $files) = @_;\n \tmy $cwd = \"$pfx/$path\";\n \tmy $pool = SVN::Pool->new;\n \t$cwd =~ s#^/+##g;\n@@ -2786,10 +2790,12 @@ sub libsvn_traverse {\n \tforeach my $d (keys %$dirent) {\n \t\tmy $t = $dirent->{$d}->kind;\n \t\tif ($t == $SVN::Node::dir) {\n-\t\t\tlibsvn_traverse($gui, $cwd, $d, $rev);\n+\t\t\tlibsvn_traverse($gui, $cwd, $d, $rev, $files);\n \t\t} elsif ($t == $SVN::Node::file) {\n-\t\t\tprint \"\\tA\\t$cwd/$d\\n\" unless $_q;\n-\t\t\tlibsvn_get_file($gui, \"$cwd/$d\", $rev);\n+\t\t\tmy $file = \"$cwd/$d\";\n+\t\t\tprint \"\\tA\\t$file\\n\" unless $_q;\n+\t\t\tlibsvn_get_file($gui, $file, $rev);\n+\t\t\t$files->{$file} = 1 if defined $files;\n \t\t}\n \t}\n \t$pool->clear;\n@@ -2913,9 +2919,7 @@ sub libsvn_new_tree {\n \t}\n \tmy ($paths, $rev, $author, $date, $msg) = @_;\n \topen my $gui, '| git-update-index -z --index-info' or croak $!;\n-\tmy $pool = SVN::Pool->new;\n-\tlibsvn_traverse($gui, '', $SVN_PATH, $rev, $pool);\n-\t$pool->clear;\n+\tlibsvn_traverse($gui, '', $SVN_PATH, $rev);\n \tclose $gui or croak $?;\n \treturn libsvn_log_entry($rev, $author, $date, $msg);\n }\n-- \n1.4.1.g9d8f\n"},{"id":"23943","messageId":"b6327a230607192131x2623af69jf1f47d5e43e52023@mail.gmail.com","threadId":"4923","inReplyTo":"20060720024815.GC31763@localdomain","subject":"Re: git-svn: Missing files","fromName":"Ben Williamson","fromEmail":"benw@pobox.com","sentAt":"2006-07-20T04:31:54Z","receivedAt":"2006-07-20T04:31:54Z","isPatch":false,"sender":{"key":"benw@pobox.com","avatar":"https://gravatar.com/avatar/e08b68465386043da911bf45e1f631ba33a6198290470ee750437ddc2e724f73?d=mp&s=160"},"body":"Wow, I just got back from lunch to three replies and a patch! I'll try\nto keep up here...\n\nOn 7/20/06, Eric Wong wrote:\n> May I ask if you have the Perl SVN:: library bindings installed? If so\n> 1.1.1-broken (and all versions afterwards) will automatically. use them\n> (if the SVN library version is >= 1.1).\n\nYes I have Perl SVN:: installed, because I started off trying\ngit-svnimport. (Most of my attempts there resulted in lots of commits\nof the same empty tree, until someone else on this list mentioned that\n\"trunk/projectname\" should be removed from the url. Then it started\nworking, but it seems to be a large repo and was taking forever, so I\ntried git-svn.) I didn't realise git-svn didn't need the Perl stuff.\n\n$ rpm -qa | grep subversion\nsubversion-1.2.1-0.1.1.fc3.rf\nsubversion-perl-1.2.1-0.1.1.fc3.rf\n\n> Nevertheless, I'm running an import right now (with the SVN:: libraries enabled)\n> and will make another run with them disabled (which is kind of slow).\n> I'll keep you posted...\n\nMe too, with your latest script - will let you know. Thanks!\n\n- Ben.\n"},{"id":"23944","messageId":"b6327a230607192251j32cad47epbf3362d4b81ff537@mail.gmail.com","threadId":"4923","inReplyTo":"20060720034841.GA28298@localdomain","subject":"Re: [PATCH] Re: git-svn: Missing files","fromName":"Ben Williamson","fromEmail":"benw@pobox.com","sentAt":"2006-07-20T05:51:02Z","receivedAt":"2006-07-20T05:51:02Z","isPatch":true,"sender":{"key":"benw@pobox.com","avatar":"https://gravatar.com/avatar/e08b68465386043da911bf45e1f631ba33a6198290470ee750437ddc2e724f73?d=mp&s=160"},"body":"On 7/20/06, Eric Wong wrote:\n> Ben, can you please try this patch against the git-svn.perl file in\n> master? You can also find the full patched file here:\n>\n> http://git-svn.bogomips.org/git-svn.perl\n\nJust finished, and the results were heaps better, but it seems\npackage/dhcp/Config.in was still missed. (The others below are empty\ndirectories.)\n\n$ diff -ur --exclude=.git --exclude=.svn svn-export/buildroot\ngit-svn-fetch-fixed/buildroot\nOnly in svn-export/buildroot/package/dhcp: Config.in\nOnly in svn-export/buildroot/package: linux\nOnly in svn-export/buildroot/target/generic: access_point\nOnly in svn-export/buildroot/target/generic: firewall\n\nHey, good enough for me, but then I'm not using dhcp... ;)\n\n- Ben.\n"},{"id":"23947","messageId":"20060720084301.GA29440@localdomain","threadId":"4923","inReplyTo":"20060720034841.GA28298@localdomain","subject":"[PATCH] git-svn: fix fetching new directories copies when using SVN:: libs","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-07-20T08:43:01Z","receivedAt":"2006-07-20T08:43:01Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Log output from SVN doesn't list all the new files that were\nadded if a new directory was copied from an existing place in\nthe repository. This means we'll have to do some extra work and\ntraverse new directories ourselves.\n\nThis has been updated from the original patch to defer traversed\nadds until all removals have been done. Please disregard the\noriginal.\n\nThanks to Ben Williamson for the excellent bug report and\ntesting.\n\nSigned-off-by: Eric Wong \n---\n git-svn.perl | 23 ++++++++++++++++-------\n 1 files changed, 16 insertions(+), 7 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 89ad840..6453771 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -2709,6 +2709,12 @@ sub libsvn_fetch {\n \t\t\t} else {\n \t\t\t\tdie \"Unrecognized action: $m, ($f r$rev)\\n\";\n \t\t\t}\n+\t\t} elsif ($t == $SVN::Node::dir && $m =~ /^[AR]$/) {\n+\t\t\tmy @traversed = ();\n+\t\t\tlibsvn_traverse($gui, '', $f, $rev, \\@traversed);\n+\t\t\tforeach (@traversed) {\n+\t\t\t\tpush @amr, [ $m, $_ ]\n+\t\t\t}\n \t\t}\n \t\t$pool->clear;\n \t}\n@@ -2778,7 +2784,7 @@ sub libsvn_parse_revision {\n }\n \n sub libsvn_traverse {\n-\tmy ($gui, $pfx, $path, $rev) = @_;\n+\tmy ($gui, $pfx, $path, $rev, $files) = @_;\n \tmy $cwd = \"$pfx/$path\";\n \tmy $pool = SVN::Pool->new;\n \t$cwd =~ s#^/+##g;\n@@ -2786,10 +2792,15 @@ sub libsvn_traverse {\n \tforeach my $d (keys %$dirent) {\n \t\tmy $t = $dirent->{$d}->kind;\n \t\tif ($t == $SVN::Node::dir) {\n-\t\t\tlibsvn_traverse($gui, $cwd, $d, $rev);\n+\t\t\tlibsvn_traverse($gui, $cwd, $d, $rev, $files);\n \t\t} elsif ($t == $SVN::Node::file) {\n-\t\t\tprint \"\\tA\\t$cwd/$d\\n\" unless $_q;\n-\t\t\tlibsvn_get_file($gui, \"$cwd/$d\", $rev);\n+\t\t\tmy $file = \"$cwd/$d\";\n+\t\t\tif (defined $files) {\n+\t\t\t\tpush @$files, $file;\n+\t\t\t} else {\n+\t\t\t\tprint \"\\tA\\t$file\\n\" unless $_q;\n+\t\t\t\tlibsvn_get_file($gui, $file, $rev);\n+\t\t\t}\n \t\t}\n \t}\n \t$pool->clear;\n@@ -2913,9 +2924,7 @@ sub libsvn_new_tree {\n \t}\n \tmy ($paths, $rev, $author, $date, $msg) = @_;\n \topen my $gui, '| git-update-index -z --index-info' or croak $!;\n-\tmy $pool = SVN::Pool->new;\n-\tlibsvn_traverse($gui, '', $SVN_PATH, $rev, $pool);\n-\t$pool->clear;\n+\tlibsvn_traverse($gui, '', $SVN_PATH, $rev);\n \tclose $gui or croak $?;\n \treturn libsvn_log_entry($rev, $author, $date, $msg);\n }\n-- \n1.4.1.g9d8f\n"},{"id":"24043","messageId":"7vmzazfqqp.fsf@assigned-by-dhcp.cox.net","threadId":"4923","inReplyTo":"20060720084301.GA29440@localdomain","subject":"Re: [PATCH] git-svn: fix fetching new directories copies when using SVN:: libs","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-24T06:42:38Z","receivedAt":"2006-07-24T06:42:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}