Package: git-core
Version: 1:1.5.3.4-1
Severity: normal

I'm glad that I diffed my git-svnimport (run with parameters -i -I
.gitignore) of ikiwiki against a checkout of the subversion repository
before switching ikiwiki to git, because the git-svnimport command
seems to have left out some files:

        diff --exclude=.svn --exclude=.git -ur ~/tmp/ikiwiki-git/ ~/src/ikiwiki/
        Only in /home/joey/src/ikiwiki: CHANGELOG
        Only in /home/joey/src/ikiwiki/IkiWiki: Setup.pm
        Only in /home/joey/src/ikiwiki: Makefile
        Only in /home/joey/src/ikiwiki: NEWS
        Only in /home/joey/src/ikiwiki/debian: README.Debian
        Only in /home/joey/src/ikiwiki/debian: compat
        Only in /home/joey/src/ikiwiki/debian: preinst
        Only in /home/joey/src/ikiwiki/t: basename.t
        Only in /home/joey/src/ikiwiki/t: bestlink.t
        Only in /home/joey/src/ikiwiki/t: crazy-badass-perl-bug.t

etc

Looking at one missing file, the CHANGELOG file is a symlink, which was
introduced in svn commit r1361. In the git-svnimport repo, that commit
is 8832bc844e4aef26572285713d6a18a2cc2e3b63, and it includes adding
the symlink:

        diff --git a/CHANGELOG b/CHANGELOG
        new file mode 120000
        index 0000000..d526672
        --- /dev/null
        +++ b/CHANGELOG
        @@ -0,0 +1 @@
        +debian/changelog
        \ No newline at end of file

But it later gets removed:

        commit b808596a6db38cd2ec726fe796f669c4b8c80d18
        Author: joey <joey>
        Date:   Sat Feb 10 20:43:50 2007 +0000
        
            web commit by JoshTriplett: Add another shortcut which will require 
this feature: Debian changelog URLs, which need to turn `packagename` into 
`p/packagename`.
        
        diff --git a/.gitignore b/.gitignore
        deleted file mode 100644
        index b2123b2..0000000
        --- a/.gitignore
        +++ /dev/null
        @@ -1,8 +0,0 @@
        -ikiwiki.out
        -Makefile.old
        -html
        -pm_to_blib
        -blib
        -ikiwiki.man
        -ikiwiki-mass-rebuild.man
        -Makefile
        diff --git a/CHANGELOG b/CHANGELOG
        deleted file mode 120000
        index d526672..0000000
        --- a/CHANGELOG
        +++ /dev/null
        @@ -1 +0,0 @@
        -debian/changelog
        \ No newline at end of file
        diff --git a/IkiWiki.pm b/IkiWiki.pm
        deleted file mode 100644
        index 32ca044..0000000

(Much other removal of files trimmed.)

Now, this is very strange, because that commit, which based on the commit
message was r2480 or r2481 in the svn repository (both had the same commit
message, which is kinda unusual, I assume it was r2480 based on the date, but
will show them both here), did NOT delete files.

        r2481 | joey | 2007-02-10 15:44:34 -0500 (Sat, 10 Feb 2007) | 1 line
        Changed paths:
           M 
/trunk/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn
        
        web commit by JoshTriplett: Add another shortcut which will require 
this feature: Debian changelog URLs, which need to turn `packagename` into 
`p/packagename`.

        r2480 | joey | 2007-02-10 15:43:50 -0500 (Sat, 10 Feb 2007) | 1 line
        Changed paths:
           M 
/trunk/doc/todo/simple_text_parsing_or_regex_in_template_or_shortcut.mdwn

        web commit by JoshTriplett: Add another shortcut which will require 
this feature: Debian changelog URLs, which need to turn `packagename` into 
`p/packagename`.


git-svn perfectly reproduced the subversion head. If git-svnimport
leaves out files like this, its not safe to use and should have big
warning messages, or be dropped. It's currently not at all clear to
a new git user that git-svn is the thing to use, and that git-svnimport
should be avoided.

I can provide a tarball of the ikiwiki svn repo if anyone wants it.
(90 mb.)

I'm not marking this bug as grave simply because the missing data 
is still buried in the git repository generated by git-svnimport. Though
it would take quite some digging to get it back out if I hadn't noticed
this before switching to git.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git-core depends on:
ii  cpio                    2.9-4            GNU cpio -- a program to manage ar
ii  libc6                   2.6.1-6          GNU C Library: Shared libraries
ii  libcurl3-gnutls         7.17.0-1         Multi-protocol file transfer libra
ii  libdigest-sha1-perl     2.11-2           NIST SHA-1 message digest algorith
ii  liberror-perl           0.15-8           Perl module for error/exception ha
ii  libexpat1               1.95.8-4         XML parsing C library - runtime li
ii  perl-modules            5.8.8-11.1       Core Perl modules
ii  zlib1g                  1:1.2.3.3.dfsg-6 compression library - runtime

Versions of packages git-core recommends:
ii  curl                         7.17.0-1    Get a file from an HTTP, HTTPS or 
ii  git-doc                      1:1.5.3.4-1 fast, scalable, distributed revisi
ii  less                         408-2       Pager program similar to more
ii  openssh-client [ssh-client]  1:4.6p1-5   secure shell client, an rlogin/rsh
ii  patch                        2.5.9-4     Apply a diff file to an original
ii  rsync                        2.6.9-5     fast remote file copy program (lik

-- no debconf information

-- 
see shy jo

Attachment: signature.asc
Description: Digital signature

Reply via email to