{"thread":{"id":"15080","subject":"git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","startedAt":"2008-08-19T07:00:30Z","lastAt":"2008-08-20T07:52:34Z","messageCount":5,"participants":["Pete/Piet Delaney","Michael Haggerty","Matthias Urlichs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"87649","messageId":"48AA6F8E.70807@bluelane.com","threadId":"15080","inReplyTo":null,"subject":"git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","fromName":"Pete/Piet Delaney","fromEmail":"pete@bluelane.com","sentAt":"2008-08-19T07:00:30Z","receivedAt":"2008-08-19T07:00:30Z","isPatch":false,"sender":{"key":"pete@bluelane.com","avatar":null},"body":"I'm running into a problem with git-cvsimport. The last\nimport went fine; in that case the import was a new\nbranch to the cvs repo ('virtualshield_saflow').\n\nIn this new case the cvs branch was modified. I thought\nI hadn't modified this branch, but only merged it into\nother branches (that unfortunately were in the cvs repo).\nWe haven't checked anything into those branches so it seems\nlike that mistake isn't/wasn't causing problems.\n\nThis recent merge appears to be discarding changes that\nI've made in the git repo. The merge seems to default to\na repo without the changes.\n\n\nThe command I used to import the 'virtualshield_saflow' branch\nfrom the CVS repo was:\n\n\n    git-cvsimport -o virtualshield_saflow -r origin blux\n\nI can't find my notes on the for I used last time, but as\nI recall I didn't have to use both the -o and -r options.\n\nIt appeared that a few changes were missing and it seemed like\nthe problem was resolved last time by doing a second cvsimport.\n\nThis third git-cvsimport proceeded without any errors. The output seemed\nto show changes in most of the files involved since the creating\nof the 'virtualshield_saflow' branch (2nd cvsimport), not just\nthe recent changes (just a few files).\n\nAttaching the log during the cvsimport.\n\nI'll take another stab at it tomarrow. Any thoughts or\nrecommendations appreciated.\n\n-piet\n\n\n/nethome/piet/src/kilo/blux.prev$ git branch -a\n* master\n  origin/HEAD\n  origin/beta1_branch\n  origin/echo_branch\n  origin/engg\n  origin/integrated_branch\n  origin/master\n  origin/mg250_branch\n  origin/origin\n  origin/port_redirect_branch\n  origin/rc1_branch\n  origin/rel1_0_branch\n  origin/rel2_branch\n  origin/test_version_branch\n  origin/upgrade_test\n  origin/vendor_tag\n  origin/virtualshield_saflow\n/nethome/piet/src/kilo/blux.prev$ git-cvsimport -o virtualshield_saflow -r origin blux\nGenerating pack...\nCounting objects: 19166\nDone counting 21689 objects.\nDeltifying 21689 objects...\n 100% (21689/21689) done\nWriting 21689 objects...\n 100% (21689/21689) done\nTotal 21689 (delta 13062), reused 21181 (delta 12718)\nPack pack-d58901c5098e7d286b2f1c227f42019cca30558a created.\nRemoving unused objects 100%...\nDone.\nUpdating 8be945b..6d2edd2\nChecking 207 files out...\n 100% (207/207) done\nFast forward\n .gitignore                                         |  111 +\n .toolchain.revisions                               |   32 -\n Makefile                                           |   37 +-\n README                                             |    2 -\n cli/quagga-0.96/lib/bluelane.c                     |   21 +-\n cli/quagga-0.96/lib/bluelane.h                     |    4 +\n cli/quagga-0.96/lib/dbg.h                          |    2 -\n cli/quagga-0.96/vtysh/vtysh_bluelane.c             |  224 +-\n cli/quagga-0.96/zebra/interface.c                  |   11 +-\n cli/quagga-0.96/zebra/zebra_bluelane.c             |   43 +-\n doit                                               |    2 +-\n doit.fast                                          |   12 +\n .../blue_lane/bin/config_remote_syslog_server.pl   |   50 -\n files/common/blue_lane/bin/getsystemtype.pl        |  107 +-\n files/common/blue_lane/bin/image_name.pl           |  700 +-\n files/common/blue_lane/bin/install_image.pl        |   44 +-\n files/common/blue_lane/bin/show-ethernet           |   11 +\n files/common/blue_lane/bin/show-stacktrace         |   82 +-\n files/common/blue_lane/bin/slottools.pl            |   21 +-\n files/common/blue_lane/bin/syslog_conf.pl          |  118 +-\n files/common/blue_lane/bin/techsupport.pl          |    1 +\n files/common/blue_lane/default_files/passwd        |    1 +\n files/common/blue_lane/license.txt                 |    3 +-\n files/common/common/etc/passwd                     |    1 +\n files/common/etc/logrotate.conf                    |    6 +-\n files/common/etc/passwd                            |    1 +\n files/common/etc/rc.d/init.d/bluelane              |   19 +-\n files/common/etc/rc.d/init.d/syslog-ng             |   29 +\n files/common/etc/rc.d/rc3.d/.symlinks              |    1 +\n files/common/etc/shadow                            |    1 +\n files/common/etc/syslog-ng.conf                    |   50 +\n files/common/etc/syslog.conf                       |    2 -\n files/distributor/fsscan.log                       |    1 -\n .../blue_lane/configs/system.info.g650             |  103 +\n files/gateway/fsscan.log                           |    1 -\n files/manager/fsscan.log                           |    1 -\n .../mg/custom_files/blue_lane/bin/db-reinstall.sh  |    5 +-\n .../custom_files/blue_lane/bin/gen_vmwall_logs.sh  |    9 +\n .../custom_files/blue_lane/bin/gen_vmwall_stats.sh |    9 +\n files/mg/custom_files/blue_lane/bin/kernel_bypass  |  153 +\n .../custom_files/blue_lane/bin/print_vmwall_rules  |  217 +\n files/mg/custom_files/blue_lane/bin/vmwall_rules   |   26 +\n .../blue_lane/bin/vmwall_server_state_lookup.pl    |  167 +\n .../blue_lane/configs/system.info.g250             |    4 +-\n .../blue_lane/configs/system.info.g250.revB        |    2 +-\n .../blue_lane/configs/system.info.g450             |    2 +-\n .../blue_lane/configs/system.info.g650             |  103 +\n .../custom_files/blue_lane/configs/system.info.m10 |    2 +-\n .../custom_files/blue_lane/configs/system.info.vg  |    2 +-\n .../custom_files/blue_lane/configs/system.info.vm  |    2 +-\n .../blue_lane/configs/system.info.vmware           |    2 +-\n .../blue_lane/default_files/zebra.conf.g650        |   33 +\n .../mg/custom_files/etc/rc.d/init.d/bl_catalina.sh |    2 +-\n .../custom_files/etc/rc.d/init.d/bluelane-gateway  |   19 +-\n .../custom_files/etc/rc.d/init.d/bluelane-vmwall   |   58 +\n files/mg/custom_files/etc/rc.d/init.d/crash        |   26 +\n .../custom_files/etc/rc.d/init.d/gateway-startup   |   62 +-\n .../custom_files/etc/rc.d/init.d/irq-affinity.pl   |   56 +-\n files/mg/custom_files/etc/rc.d/init.d/rc           |  126 +\n files/mg/custom_files/etc/rc.d/rc.local            |    2 +\n files/mg/custom_files/etc/rc.d/rc1.d/.symlinks     |    1 +\n files/mg/custom_files/etc/rc.d/rc1.d/S01crash      |    1 +\n files/mg/custom_files/etc/rc.d/rc3.d/.symlinks     |    1 +\n files/mg/custom_files/etc/rc.d/rc3.d/S01crash      |    1 +\n files/mg/custom_files/etc/rc.d/rc6.d/.symlinks     |    1 +\n files/mg/custom_files/home/secureall/.ssh/id_rsa   |   15 +\n files/mg/custom_files/home/secureall/.ssh/identity |  Bin 0 -> 536 bytes\n files/mg/custom_files/root/.ssh/authorized_keys    |    2 +\n files/mg/custom_files/root/cat-ip-conntrack.sh     |   66 +\n files/mg/fsscan.log                                |  547 +-\n files/mg/install_script                            |   16 +-\n files/mg/setup_version                             |    8 +-\n .../custom_files/blue_lane/configs/system.info     |    2 +-\n .../blue_lane/configs/system.info.g250             |    2 +-\n .../blue_lane/configs/system.info.g450             |    2 +-\n .../blue_lane/configs/system.info.g650             |  103 +\n .../blue_lane/configs/system.info.m10.0            |    2 +-\n .../blue_lane/configs/system.info.m10.1            |    2 +-\n files/recovery/fsscan.log                          |    1 -\n packages/Makefile.rules                            |   11 +-\n packages/Orbit2/Makefile.ORBit2-2.14.7_1st_attempt |   24 +\n packages/Orbit2/ORBit2-2.14.7.tar.bz2              |  Bin 0 -> 729469 bytes\n packages/bypass/Makefile                           |    2 +-\n packages/crash/Makefile                            |   10 +-\n packages/crash/crash-4.0-5.1.tar.bz2               |  Bin 0 -> 17748934 bytes\n packages/eventlog/Makefile                         |   11 +\n packages/eventlog/eventlog-0.2.7.tar.gz            |  Bin 0 -> 322603 bytes\n packages/gdb/Makefile                              |    2 +-\n packages/gdb/gdb-6.8.tar.bz2                       |  Bin 0 -> 15581304 bytes\n packages/git/Makefile                              |   11 +\n packages/git/git-1.5.4.2.tar.bz2                   |  Bin 0 -> 1586823 bytes\n packages/glib-1.2.10/Makefile                      |   17 +\n packages/glib-1.2.10/README                        |    3 +\n packages/glib-1.2.10/glib-1.2.10-gcc34-1.patch     |   19 +\n packages/glib-1.2.10/glib-1.2.10.tar.gz            |  Bin 0 -> 421480 bytes\n packages/glib-2.4.1/Makefile                       |   17 +\n packages/{glib => glib-2.4.1}/glib-2.4.1.tar.bz2   |  Bin 2028551 -> 2028551 bytes\n packages/glib/Makefile                             |    2 +-\n packages/glib/README                               |    9 +\n packages/glib/glib-2.12.12.tar.bz2                 |  Bin 0 -> 2938743 bytes\n packages/glibc/.gitignore                          |    7 +\n packages/glibc/.symlinks                           |    6 +-\n packages/glibc/Makefile                            |   23 +-\n packages/glibc/Makefile.glibc-2.3.4-20040701       |   41 +\n packages/glibc/doit                                |   10 +\n packages/glibc/glib-2.12.12.tar.bz2                |  Bin 0 -> 2938743 bytes\n packages/gtk/Makefile                              |   17 +\n packages/gtk/README                                |    4 +\n packages/gtk/gtk+-1.2.10.tar.bz2                   |  Bin 0 -> 2248777 bytes\n packages/iptables/Makefile                         |   24 +-\n packages/iptables/README                           |    8 +\n packages/iptables/doit                             |    9 +\n packages/iptables/iptables-1.3.2.tar.bz2           |  Bin 186255 -> 0 bytes\n packages/iptables/iptables-1.3.6.tar.bz2           |  Bin 0 -> 185438 bytes\n packages/iptables/iptables-1.3.8.tar.bz2           |  Bin 0 -> 172584 bytes\n packages/irqbalance/Makefile                       |   24 +\n packages/irqbalance/Makefile.irqbalance-0.55       |   22 +\n packages/irqbalance/classify.c                     |  126 +\n packages/irqbalance/doit                           |    9 +\n packages/irqbalance/irqbalance-0.55.tar.bz2        |  Bin 0 -> 19055 bytes\n packages/kexec-tools/Makefile                      |   37 +\n packages/kexec-tools/Makefile.kexec-tools-1.101    |   12 +\n packages/kexec-tools/doit                          |    9 +\n packages/kexec-tools/kexec-tools-1.101.tar.bz2     |  Bin 0 -> 172107 bytes\n packages/kexec-tools/kexec-tools-testing.tar.bz2   |  Bin 0 -> 828793 bytes\n packages/libIDL/Makefile                           |    2 +-\n packages/libIDL/libIDL-0.8.8.tar.bz2               |  Bin 0 -> 335188 bytes\n packages/libnet/Makefile                           |   11 +\n packages/libnet/libnet-1.1.2.1.tar.gz              |  Bin 0 -> 1021236 bytes\n packages/libxml2/Makefile                          |    2 +-\n packages/libxml2/libxml2-2.6.31.tar.bz2            |  Bin 0 -> 3641593 bytes\n packages/linux/Makefile                            |   75 +-\n packages/lmsensors/Makefile                        |   13 +-\n packages/lmsensors/README                          |    5 +\n packages/lmsensors/lm_sensors-3.0.1.tar.bz2        |  Bin 0 -> 186183 bytes\n packages/lmsensors/sensors3.conf.new               | 2450 ++++\n packages/n2261-r6d/Makefile                        |    3 +-\n packages/nfs-utils/Makefile                        |   15 +\n packages/nfs-utils/nfs-utils-1.0.10.tar.bz2        |  Bin 0 -> 528352 bytes\n packages/openssh/openssh-3.8.1p1.tar.bz2           |  Bin 657788 -> 664506 bytes\n packages/pci-utilities/Makefile                    |   13 +-\n packages/pci-utilities/pci.ids                     |14949 ++++++++++++++++++++\n packages/pci-utilities/pciutils-2.2.3.tar.bz2      |  Bin 0 -> 1115369 bytes\n packages/perl/Makefile                             |    8 +\n packages/perl/packages/Expect-1.21.tar.gz          |  Bin 0 -> 53881 bytes\n packages/perl/packages/IO-Tty-1.07.tar.gz          |  Bin 0 -> 22004 bytes\n packages/perl/packages/Net-SSH-Expect-1.09.tar.gz  |  Bin 0 -> 15074 bytes\n packages/perl/packages/Text-ASCIITable-0.17.tar.gz |  Bin 0 -> 20647 bytes\n packages/pkgconfig/Makefile                        |    2 +-\n packages/pkgconfig/pkg-config-0.22.tar.bz2         |  Bin 0 -> 747667 bytes\n packages/portmap/Makefile                          |   16 +\n packages/portmap/doit                              |    8 +\n .../portmap-5beta-compilation_fixes-3.patch        |  705 +\n .../portmap/portmap-5beta-glibc_errno_fix-1.patch  |   17 +\n packages/portmap/portmap_5beta.tar.bz2             |  Bin 0 -> 18321 bytes\n .../portwell_bypass/ABN-484_development.tar.bz2    |  Bin 0 -> 115941 bytes\n packages/portwell_bypass/ABN478_Utility.tar.bz2    |  Bin 0 -> 105117 bytes\n packages/portwell_bypass/ABN_484_1st.tar.bz2       |  Bin 0 -> 121466 bytes\n packages/portwell_bypass/Makefile                  |   17 +\n packages/portwell_bypass/Makefile.ABN478_Utility   |   16 +\n packages/portwell_bypass/doit                      |    9 +\n packages/qt/Makefile                               |   17 +\n packages/qt/qt-x11-free-3.3.8.tar.bz2              |  Bin 0 -> 14360483 bytes\n packages/raidtools/Makefile                        |   11 +\n packages/raidtools/README                          |    6 +\n packages/raidtools/raidtools-1.00.3.tar.bz2        |  Bin 0 -> 137864 bytes\n packages/smarttools/Makefile                       |    2 +-\n packages/smarttools/README                         |    5 +\n packages/smarttools/smartmontools-5.36.tar.bz2     |  Bin 0 -> 443297 bytes\n packages/smarttools/smartmontools-5.37.tar.bz2     |  Bin 0 -> 478833 bytes\n packages/strace/Makefile                           |   13 +-\n packages/strace/doit                               |   10 +\n packages/strace/strace-4.5.16.tar.bz2              |  Bin 0 -> 457272 bytes\n packages/sudo/sudoers                              |    1 +\n packages/syslog-ng/Makefile                        |   12 +\n packages/syslog-ng/syslog-ng-2.0.9.tar.gz          |  Bin 0 -> 378779 bytes\n packages/sysmgr-daemon/link_watchd.c               |   35 +-\n packages/sysmgr-daemon/sysmgr-daemon.c             |   17 +\n packages/tcp-wrappers/Makefile                     |   41 +\n .../tcp-wrappers-7.6-patches-1.0.tar.bz2           |  Bin 0 -> 16128 bytes\n packages/tcp-wrappers/tcp_wrappers_7.6.tar.gz      |  Bin 0 -> 99438 bytes\n packages/tcp_wrappers/Makefile                     |   17 +\n packages/tcp_wrappers/doit                         |    8 +\n .../tcp_wrappers-7.6-shared_lib_plus_plus-1.patch  | 1035 ++\n packages/tcp_wrappers/tcp_wrappers_7.6.tar.bz2     |  Bin 0 -> 78615 bytes\n packages/tcsh/Makefile                             |   11 +\n packages/tcsh/README                               |    4 +\n packages/tcsh/tcsh-6.15.00.tar.bz2                 |  Bin 0 -> 727440 bytes\n packages/tomcat/updates/catalina.sh                |    7 +-\n packages/wireshark/Makefile                        |    8 +\n packages/wireshark/README                          |   12 +\n packages/wireshark/wireshark-0.99.7.tar.bz2        |  Bin 0 -> 13179467 bytes\n scripts/build_tarimage.pl                          |   30 +-\n scripts/majornum                                   |    2 +-\n scripts/make-release.pl                            |    2 +-\n scripts/minornum                                   |    6 +-\n scripts/params.pl                                  |   11 +\n scripts/update-sources-fm.pl                       |  268 +\n scripts/update-sources.pl                          |  327 +-\n scripts/version.pl                                 |   75 +-\n tarballs/glibc-2.3.6-inotify-1.patch               |   45 +\n tarballs/glibc-2.3.6-linux_types-1.patch           |   33 +\n tarballs/glibc-2.3.6.tar.bz2                       |  Bin 0 -> 14014977 bytes\n tarballs/glibc-libidn-2.3.6.tar.bz2                |  Bin 0 -> 101041 bytes\n toolchain/glibc/Makefile                           |    2 +-\n upgrade/install-script                             |    9 +-\n 206 files changed, 23121 insertions(+), 1540 deletions(-)\n create mode 100755 .gitignore\n delete mode 100644 .toolchain.revisions\n create mode 100755 doit.fast\n delete mode 100755 files/common/blue_lane/bin/config_remote_syslog_server.pl\n create mode 100644 files/common/etc/rc.d/init.d/syslog-ng\n create mode 100644 files/common/etc/syslog-ng.conf\n delete mode 100644 files/common/etc/syslog.conf\n create mode 100644 files/gateway/custom_files/blue_lane/configs/system.info.g650\n create mode 100755 files/mg/custom_files/blue_lane/bin/gen_vmwall_logs.sh\n create mode 100755 files/mg/custom_files/blue_lane/bin/gen_vmwall_stats.sh\n create mode 100755 files/mg/custom_files/blue_lane/bin/kernel_bypass\n create mode 100755 files/mg/custom_files/blue_lane/bin/print_vmwall_rules\n create mode 100755 files/mg/custom_files/blue_lane/bin/vmwall_rules\n create mode 100755 files/mg/custom_files/blue_lane/bin/vmwall_server_state_lookup.pl\n create mode 100644 files/mg/custom_files/blue_lane/configs/system.info.g650\n create mode 100644 files/mg/custom_files/blue_lane/default_files/zebra.conf.g650\n create mode 100755 files/mg/custom_files/etc/rc.d/init.d/bluelane-vmwall\n create mode 100755 files/mg/custom_files/etc/rc.d/init.d/crash\n create mode 100755 files/mg/custom_files/etc/rc.d/init.d/rc\n create mode 100644 files/mg/custom_files/etc/rc.d/rc1.d/.symlinks\n create mode 120000 files/mg/custom_files/etc/rc.d/rc1.d/S01crash\n create mode 120000 files/mg/custom_files/etc/rc.d/rc3.d/S01crash\n create mode 100644 files/mg/custom_files/home/secureall/.ssh/id_rsa\n create mode 100644 files/mg/custom_files/home/secureall/.ssh/identity\n create mode 100644 files/mg/custom_files/root/.ssh/authorized_keys\n create mode 100755 files/mg/custom_files/root/cat-ip-conntrack.sh\n create mode 100644 files/recovery/custom_files/blue_lane/configs/system.info.g650\n create mode 100644 packages/Orbit2/Makefile.ORBit2-2.14.7_1st_attempt\n create mode 100644 packages/Orbit2/ORBit2-2.14.7.tar.bz2\n create mode 100644 packages/crash/crash-4.0-5.1.tar.bz2\n create mode 100644 packages/eventlog/Makefile\n create mode 100644 packages/eventlog/eventlog-0.2.7.tar.gz\n create mode 100644 packages/gdb/gdb-6.8.tar.bz2\n create mode 100644 packages/git/Makefile\n create mode 100644 packages/git/git-1.5.4.2.tar.bz2\n create mode 100644 packages/glib-1.2.10/Makefile\n create mode 100644 packages/glib-1.2.10/README\n create mode 100644 packages/glib-1.2.10/glib-1.2.10-gcc34-1.patch\n create mode 100644 packages/glib-1.2.10/glib-1.2.10.tar.gz\n create mode 100644 packages/glib-2.4.1/Makefile\n rename packages/{glib => glib-2.4.1}/glib-2.4.1.tar.bz2 (100%)\n create mode 100644 packages/glib/README\n create mode 100644 packages/glib/glib-2.12.12.tar.bz2\n create mode 100644 packages/glibc/.gitignore\n create mode 100644 packages/glibc/Makefile.glibc-2.3.4-20040701\n create mode 100755 packages/glibc/doit\n create mode 100644 packages/glibc/glib-2.12.12.tar.bz2\n create mode 100644 packages/gtk/Makefile\n create mode 100644 packages/gtk/README\n create mode 100644 packages/gtk/gtk+-1.2.10.tar.bz2\n create mode 100644 packages/iptables/README\n create mode 100755 packages/iptables/doit\n delete mode 100644 packages/iptables/iptables-1.3.2.tar.bz2\n create mode 100644 packages/iptables/iptables-1.3.6.tar.bz2\n create mode 100644 packages/iptables/iptables-1.3.8.tar.bz2\n create mode 100644 packages/irqbalance/Makefile\n create mode 100644 packages/irqbalance/Makefile.irqbalance-0.55\n create mode 100644 packages/irqbalance/classify.c\n create mode 100755 packages/irqbalance/doit\n create mode 100644 packages/irqbalance/irqbalance-0.55.tar.bz2\n create mode 100644 packages/kexec-tools/Makefile\n create mode 100644 packages/kexec-tools/Makefile.kexec-tools-1.101\n create mode 100755 packages/kexec-tools/doit\n create mode 100644 packages/kexec-tools/kexec-tools-1.101.tar.bz2\n create mode 100644 packages/kexec-tools/kexec-tools-testing.tar.bz2\n create mode 100644 packages/libIDL/libIDL-0.8.8.tar.bz2\n create mode 100644 packages/libnet/Makefile\n create mode 100644 packages/libnet/libnet-1.1.2.1.tar.gz\n create mode 100644 packages/libxml2/libxml2-2.6.31.tar.bz2\n create mode 100644 packages/lmsensors/README\n create mode 100644 packages/lmsensors/lm_sensors-3.0.1.tar.bz2\n create mode 100644 packages/lmsensors/sensors3.conf.new\n create mode 100644 packages/nfs-utils/Makefile\n create mode 100644 packages/nfs-utils/nfs-utils-1.0.10.tar.bz2\n create mode 100644 packages/pci-utilities/pci.ids\n create mode 100644 packages/pci-utilities/pciutils-2.2.3.tar.bz2\n create mode 100644 packages/perl/packages/Expect-1.21.tar.gz\n create mode 100644 packages/perl/packages/IO-Tty-1.07.tar.gz\n create mode 100644 packages/perl/packages/Net-SSH-Expect-1.09.tar.gz\n create mode 100644 packages/perl/packages/Text-ASCIITable-0.17.tar.gz\n create mode 100644 packages/pkgconfig/pkg-config-0.22.tar.bz2\n create mode 100644 packages/portmap/Makefile\n create mode 100755 packages/portmap/doit\n create mode 100644 packages/portmap/portmap-5beta-compilation_fixes-3.patch\n create mode 100644 packages/portmap/portmap-5beta-glibc_errno_fix-1.patch\n create mode 100644 packages/portmap/portmap_5beta.tar.bz2\n create mode 100644 packages/portwell_bypass/ABN-484_development.tar.bz2\n create mode 100644 packages/portwell_bypass/ABN478_Utility.tar.bz2\n create mode 100644 packages/portwell_bypass/ABN_484_1st.tar.bz2\n create mode 100644 packages/portwell_bypass/Makefile\n create mode 100644 packages/portwell_bypass/Makefile.ABN478_Utility\n create mode 100755 packages/portwell_bypass/doit\n create mode 100644 packages/qt/Makefile\n create mode 100644 packages/qt/qt-x11-free-3.3.8.tar.bz2\n create mode 100644 packages/raidtools/Makefile\n create mode 100644 packages/raidtools/README\n create mode 100644 packages/raidtools/raidtools-1.00.3.tar.bz2\n create mode 100644 packages/smarttools/README\n create mode 100644 packages/smarttools/smartmontools-5.36.tar.bz2\n create mode 100644 packages/smarttools/smartmontools-5.37.tar.bz2\n create mode 100755 packages/strace/doit\n create mode 100644 packages/strace/strace-4.5.16.tar.bz2\n create mode 100644 packages/syslog-ng/Makefile\n create mode 100644 packages/syslog-ng/syslog-ng-2.0.9.tar.gz\n create mode 100644 packages/tcp-wrappers/Makefile\n create mode 100644 packages/tcp-wrappers/tcp-wrappers-7.6-patches-1.0.tar.bz2\n create mode 100644 packages/tcp-wrappers/tcp_wrappers_7.6.tar.gz\n create mode 100644 packages/tcp_wrappers/Makefile\n create mode 100755 packages/tcp_wrappers/doit\n create mode 100755 packages/tcp_wrappers/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch\n create mode 100644 packages/tcp_wrappers/tcp_wrappers_7.6.tar.bz2\n create mode 100644 packages/tcsh/Makefile\n create mode 100644 packages/tcsh/README\n create mode 100644 packages/tcsh/tcsh-6.15.00.tar.bz2\n create mode 100644 packages/wireshark/Makefile\n create mode 100644 packages/wireshark/README\n create mode 100644 packages/wireshark/wireshark-0.99.7.tar.bz2\n create mode 100755 scripts/update-sources-fm.pl\n create mode 100644 tarballs/glibc-2.3.6-inotify-1.patch\n create mode 100644 tarballs/glibc-2.3.6-linux_types-1.patch\n create mode 100644 tarballs/glibc-2.3.6.tar.bz2\n create mode 100644 tarballs/glibc-libidn-2.3.6.tar.bz2\n/nethome/piet/src/kilo/blux.prev$\n\n"},{"id":"87797","messageId":"48ABB899.4090608@alum.mit.edu","threadId":"15080","inReplyTo":"48AA6F8E.70807@bluelane.com","subject":"Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2008-08-20T06:24:25Z","receivedAt":"2008-08-20T06:24:25Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Pete/Piet Delaney wrote:\n> I'm running into a problem with git-cvsimport.  [...]\n> \n> I'll take another stab at it tomarrow. Any thoughts or\n> recommendations appreciated.\n\nIf this is a one-time conversion (i.e., you don't need to actively track\na live CVS repository), then I suggest that you try cvs2svn/cvs2git [1].\n It can migrate to git via a git-fast-import output stream [2].  All\ncvsps-based tools necessarily have problems because cvsps (a) doesn't\noutput enough information for a reliable conversion and (b) gets\nconfused by certain patterns that commonly occur in CVS repository\nhistories.  cvs2svn can handle every CVS repository that we have seen\nand is also highly configurable [3].\n\nMichael\n\n[1] http://cvs2svn.tigris.org/\n[2] http://cvs2svn.tigris.org/cvs2git.html\n[3] http://cvs2svn.tigris.org/features.html\n"},{"id":"87799","messageId":"48ABC943.20508@bluelane.com","threadId":"15080","inReplyTo":"48ABB899.4090608@alum.mit.edu","subject":"Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","fromName":"Pete/Piet Delaney","fromEmail":"pete@bluelane.com","sentAt":"2008-08-20T07:35:31Z","receivedAt":"2008-08-20T07:35:31Z","isPatch":false,"sender":{"key":"pete@bluelane.com","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nMichael Haggerty wrote:\n> Pete/Piet Delaney wrote:\n>> I'm running into a problem with git-cvsimport.  [...]\n>>\n>> I'll take another stab at it tomarrow. Any thoughts or\n>> recommendations appreciated.\n> \n> If this is a one-time conversion (i.e., you don't need to actively track\n> a live CVS repository), then I suggest that you try cvs2svn/cvs2git [1].\n>  It can migrate to git via a git-fast-import output stream [2].  All\n> cvsps-based tools necessarily have problems because cvsps (a) doesn't\n> output enough information for a reliable conversion and (b) gets\n> confused by certain patterns that commonly occur in CVS repository\n> histories.  cvs2svn can handle every CVS repository that we have seen\n> and is also highly configurable [3].\n\nHi Michael:\n\n  I migrated our BLUX build environment from CVS to GIT about six\nmonths ago. In the mean time some additional development occurred\nin the CVS repo in a new 'virtualshield_saflow' branch.\n\n  In parallel, I updated the git repository and bit keeper repos in\nan upgrade from 2.6.12 to 2.6.16 kernel and quite a few of\nthe associated Linux-From-Scratch (LFS) library migrations.\n\n  My 1st resync using git-cvsimport to update the git repo by pulling in\nthe new 'virtualshield_saflow' branch went without any problems; thought\nI recall that it seems more in sync after doing a second cvsimport.\n\n  A few weeks later, the second resync came out totally wrong.\nThis evening I updated the git repo with the corrected files. It\nwould be interesting to know how it could have been done right in\nthe first place and to understand why do things like modifying the\nimported 'engg' branch that I imported and NEVER should have been\ndone confused git. I suspect that doing:\n\n    git-cvsimport -o virtualshield_saflow -r origin blux\n\nwasn't right I don't think I has to use \"-r origin' option on the\n1st import of the 'virtualshield_saflow' branch.\n\n  Hopefully we are done with the CVS repo updates. If it turns out\nthat it all should be done again, avoiding the modification of\nimported branches, we'll look at using the cvs2git approach that\nyour recommending.\n\n  How does your proposed cvs2git facility deal with importing on top\nof branches that have been modified?\n\n> \n> Michael\n> \n> [1] http://cvs2svn.tigris.org/\n> [2] http://cvs2svn.tigris.org/cvs2git.html\n> [3] http://cvs2svn.tigris.org/features.html\n\nThanks for to pointers.\n\n- -piet\n\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.7 (GNU/Linux)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niD8DBQFIq8lDJICwm/rv3hoRAut5AJ4qLkfBBym9aC7Aajae8VkkrxE58gCffb5S\nI5g8ri5ZLPUQ7uL7h/Kx2/M=\n=RF1O\n-----END PGP SIGNATURE-----\n"},{"id":"87801","messageId":"48ABCBFD.7070503@alum.mit.edu","threadId":"15080","inReplyTo":"48ABC943.20508@bluelane.com","subject":"Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2008-08-20T07:47:09Z","receivedAt":"2008-08-20T07:47:09Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Pete/Piet Delaney wrote:\n> Michael Haggerty wrote:\n>> If this is a one-time conversion (i.e., you don't need to actively track\n>> a live CVS repository), then I suggest that you try cvs2svn/cvs2git [1].\n> [...]\n> \n>   How does your proposed cvs2git facility deal with importing on top\n> of branches that have been modified?\n\ncvs2svn/cvs2git does not support this (called \"incremental imports\").\nIt is quite hard to implement robustly.  In fact, I claim that no tool\nhandles incremental imports robustly, despite the fact that some claim\nto do so :-)\n\nMichael\n"},{"id":"87804","messageId":"20080820075234.GF4047@smurf.noris.de","threadId":"15080","inReplyTo":"48ABCBFD.7070503@alum.mit.edu","subject":"Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2008-08-20T07:52:34Z","receivedAt":"2008-08-20T07:52:34Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nMichael Haggerty:\n> cvs2svn/cvs2git does not support this (called \"incremental imports\").\n\ngit-cvsimport tries to.\n\n> It is quite hard to implement robustly.  In fact, I claim that no tool\n> handles incremental imports robustly, despite the fact that some claim\n> to do so :-)\n> \nAs people are habitually mucking with their CVS repositories, your best\nway to reliably do an incremental import is to do a regular import,\nput the two trees into the same git repository (easily achieved by a\nline in .git/objects/info/alternates and strategic copying of the\ntip-of-tree references), and git-rebase your non-CVS work.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nWhen mutilating cattle, avoid the ones with testicles.\n\t\t-- The Evil Cultist List\n"}]}