Bug#704913: git-bzr fails to properly clone bzr::http://bzr.savannah.gnu.org/r/grub/trunk/grub
found 704913 git/1:1.8.2.1-1 tags 704913 + upstream clone 704913 -1 retitle -1 git-remote-bzr ignores bzr author field quit Hi, Daniel Kahn Gillmor wrote: i did two checkouts: git clone bzr::http://bzr.savannah.gnu.org/r/grub/trunk/grub grub.git bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub grub.bzr They produced very different source trees: git-remote-bzr does the following: for f in modified_final: print M %s :%u %s % f for f in removed: print D %s % (f) print That would produce the wrong behavior if a file is both modified and removed. This might be fixed by commit bc51f7c Author: Christophe Simonis christo...@kn.gl Date: Fri Apr 5 21:49:18 2013 -0600 remote-bzr: remove files before modifications which is not part of a release yet. Will investigate more. [...] revno: 4810 author: Andrey Borzenkov arvidj...@gmail.com committer: Vladimir 'phcoder' Serbinenko phco...@gmail.com branch nick: grub timestamp: Sat 2013-04-06 20:49:02 +0200 [...] commit 17b15326c633a9e2fb179ab0867f2d34fe213aa6 Author: Vladimir 'phcoder' Serbinenko phco...@gmail.com Date: Sat Apr 6 20:49:02 2013 +0200 [...] I also note from above that git-bzr seems to have failed to pick up the author metadata from bzr, and conflated committer with author. Cloning to track that separately. Many thanks, Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#704913: git-bzr fails to properly clone bzr::http://bzr.savannah.gnu.org/r/grub/trunk/grub
Package: git-bzr
Version: 1:1.8.2-1
Severity: important
I tried to look at grub's bzr repository with git-bzr (version
1:1.8.2-1) as well as with bzr (version 2.6.0~bzr6526-1).
i did two checkouts:
git clone bzr::http://bzr.savannah.gnu.org/r/grub/trunk/grub grub.git
bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub grub.bzr
They produced very different source trees:
0 dkg@reason:~/src/grub$ diff -ruN grub.{bzr,git}/grub-core | diffstat -p0
grub.git/grub-core/boot/i386/pc/pxeboot.S | 42
grub.git/grub-core/commands/efi/acpi.c| 59
grub.git/grub-core/efiemu/loadcore32.c| 22
grub.git/grub-core/efiemu/loadcore64.c| 22
grub.git/grub-core/efiemu/prepare32.c | 22
grub.git/grub-core/efiemu/prepare64.c | 22
grub.git/grub-core/efiemu/runtime/config.h| 34
grub.git/grub-core/efiemu/runtime/efiemu.S| 159 -
grub.git/grub-core/fs/tar.c |2
grub.git/grub-core/fs/ufs2.c |3
grub.git/grub-core/gfxmenu/gui_box.c | 412 ---
grub.git/grub-core/gfxmenu/gui_canvas.c | 267 --
grub.git/grub-core/gfxmenu/gui_util.c | 101
grub.git/grub-core/gnulib/argp-ba.c | 34
grub.git/grub-core/gnulib/argp-eexst.c| 30
grub.git/grub-core/gnulib/argp-fs-xinl.c | 42
grub.git/grub-core/gnulib/argp-namefrob.h | 157 -
grub.git/grub-core/gnulib/argp-pin.c | 27
grub.git/grub-core/gnulib/argp-pv.c | 34
grub.git/grub-core/gnulib/argp-pvh.c | 31
grub.git/grub-core/gnulib/argp-xinl.c | 42
grub.git/grub-core/gnulib/argp.h | 645 -
grub.git/grub-core/gnulib/error.h | 65
grub.git/grub-core/gnulib/getopt1.c | 170 -
grub.git/grub-core/gnulib/progname.c | 92
grub.git/grub-core/gnulib/progname.h | 62
grub.git/grub-core/kern/emu/time.c| 46
grub.git/grub-core/kern/generic/millisleep.c | 39
grub.git/grub-core/kern/sparc64/cache.S | 41
grub.git/grub-core/kern/sparc64/ieee1275/ieee1275.c | 91
grub.git/grub-core/kern/time.c| 37
grub.git/grub-core/lib/LzmaDec.c | 1035
grub.git/grub-core/lib/envblk.c | 296 --
grub.git/grub-core/lib/hexdump.c | 85
grub.git/grub-core/lib/libgcrypt/cipher/arcfour.c | 156 -
grub.git/grub-core/lib/libgcrypt/cipher/bithelp.h | 54
grub.git/grub-core/lib/libgcrypt/cipher/blowfish.c| 605 -
grub.git/grub-core/lib/libgcrypt/cipher/camellia-glue.c | 253 --
grub.git/grub-core/lib/libgcrypt/cipher/camellia.c| 1461
grub.git/grub-core/lib/libgcrypt/cipher/camellia.h| 81
grub.git/grub-core/lib/libgcrypt/cipher/cast5.c | 620 -
grub.git/grub-core/lib/libgcrypt/cipher/elgamal.c | 846 ---
grub.git/grub-core/lib/libgcrypt/cipher/hash-common.c | 94
grub.git/grub-core/lib/libgcrypt/cipher/hash-common.h | 33
grub.git/grub-core/lib/libgcrypt/cipher/hmac-tests.c | 732 --
grub.git/grub-core/lib/libgcrypt/cipher/rijndael-tables.h | 1687 --
grub.git/grub-core/lib/libgcrypt/cipher/rijndael.c| 1253 --
grub.git/grub-core/lib/libgcrypt/cipher/rmd.h | 37
grub.git/grub-core/lib/libgcrypt/cipher/seed.c| 478 ---
grub.git/grub-core/lib/posix_wrap/errno.h | 28
grub.git/grub-core/lib/posix_wrap/stdint.h|1
grub.git/grub-core/loader/i386/bsd32.c|6
grub.git/grub-core/loader/i386/bsd64.c|6
grub.git/grub-core/video/sm712_init.c | 14
54 files changed, 12713 deletions(-)
0 dkg@reason:~/src/grub$
This is despite them both appearing to claim to be at the same revision:
0 dkg@reason:~/src/grub$ (cd grub.bzr bzr log -r-1)
revno: 4810
author: Andrey Borzenkov arvidj...@gmail.com
committer: Vladimir 'phcoder' Serbinenko phco...@gmail.com
branch nick: grub
timestamp: Sat 2013-04-06 20:49:02 +0200
message:
* conf/Makefile.extra-dist (EXTRA_DIST): Add
grub-core/lib/libgcrypt/src/gcrypt.h.in and util/import_gcrypth.sed.
0 dkg@reason:~/src/grub$ (cd grub.git git log -n1)
commit 17b15326c633a9e2fb179ab0867f2d34fe213aa6
Author: Vladimir 'phcoder' Serbinenko phco...@gmail.com
Date: Sat Apr 6 20:49:02 2013 +0200
* conf/Makefile.extra-dist (EXTRA_DIST): Add
