Hi Guido, On ven, fév 09, 2007 at 09:07:56 +0100, Guido Guenther wrote: > Could you send me the git repo and the tarball via private mail or an > URL to clone from to reproduce this? Removals do work fine here (tried > that with dozens of packages).
Actually I was a bit wrong in my bug: in the git repo everything is ok. The problem is only in the workdir, in which a deleted file is still present after git-import-orig. I'm attaching a log of what to do to reproduce the bug. The two removed files in the 0.4 tarball are mpi.c and mpi.h. See the log line 380, the file src/mpi.c is "renamed", where as src/mpi.h is "deleted" (line 384). src/mpi.h is deleted in the workdir but src/mpi.c is still here. I still think it's a small bug. Regards, -- Arnaud Cornet
sipang ..n/Packages/xyssl/tmp/xyssl% apt-get source libxyssl-dev 22:59 Reading package lists... Done Building dependency tree... Done Need to get 136kB of source archives. Get:1 http://ftp.fr.debian.org unstable/main xyssl 0.3-1 (dsc) [581B] Get:2 http://ftp.fr.debian.org unstable/main xyssl 0.3-1 (tar) [134kB] Get:3 http://ftp.fr.debian.org unstable/main xyssl 0.3-1 (diff) [1702B] Fetched 136kB in 0s (6258kB/s) dpkg-source: extracting xyssl in xyssl-0.3 dpkg-source: unpacking xyssl_0.3.orig.tar.gz dpkg-source: applying ./xyssl_0.3-1.diff.gz sipang ..n/Packages/xyssl/tmp/xyssl% git-import-dsc xyssl_0.3-1.dsc 22:59 Upstream version: 0.3 Debian version: 1 defaulting to local storage area Committing initial tree 03dcea8cf333b78e835eb0aab50f0e46857cb377 dpkg-source: extracting xyssl in /home/nohar/Debian/Packages/xyssl/tmp/xyssl/tmpalQyMA/unpack/xyssl-0.3-1 dpkg-source: unpacking xyssl_0.3.orig.tar.gz dpkg-source: applying /home/nohar/Debian/Packages/xyssl/tmp/xyssl/xyssl_0.3-1.diff.gz TLACMD: git LOGTEXT Imported xyssl-0.3-1 into Git repository Imported Debian patch Everything imported under xyssl sipang ..n/Packages/xyssl/tmp/xyssl% wget http://xyssl.org/code/download/xyssl-0.4.tgz --22:59:59-- http://xyssl.org/code/download/xyssl-0.4.tgz => `xyssl-0.4.tgz' Resolving xyssl.org... 88.191.21.42 Connecting to xyssl.org|88.191.21.42|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 212,915 (208K) [application/x-gzip] 100%[====================================>] 212,915 --.--K/s 22:59:59 (8.50 MB/s) - `xyssl-0.4.tgz' saved [212915/212915] sipang ..n/Packages/xyssl/tmp/xyssl% cd xyssl 22:59 sipang ..ages/xyssl/tmp/xyssl/xyssl% git-import-orig -u 0.4 ../xyssl-0.4.tgz Upstream version is 0.4 Importing ../xyssl-0.4.tgz to upstream branch... master * upstream TLACMD: git Num Source Files Num Destination Files --- ----------------------------------- --- ----------------------------------- 0 src/mpi.c 0 doc/ 1 src/mpi.h 1 doc/aes_8h-source.html 2 2 doc/aes_8h.html 3 3 doc/annotated.html 4 4 doc/arc4_8h-source.html 5 5 doc/arc4_8h.html 6 6 doc/base64_8h-source.html 7 7 doc/base64_8h.html 8 8 doc/bignum_8h-source.html 9 9 doc/bignum_8h.html a a doc/des_8h-source.html b b doc/des_8h.html c c doc/dhm_8h-source.html d d doc/dhm_8h.html e e doc/doxygen.css f f doc/doxygen.png 10 10 doc/files.html 11 11 doc/ftv2blank.png 12 12 doc/ftv2doc.png 13 13 doc/ftv2folderclosed.png 14 14 doc/ftv2folderopen.png 15 15 doc/ftv2lastnode.png 16 16 doc/ftv2link.png 17 17 doc/ftv2mlastnode.png 18 18 doc/ftv2mnode.png 19 19 doc/ftv2node.png 1a 1a doc/ftv2plastnode.png 1b 1b doc/ftv2pnode.png 1c 1c doc/ftv2vertline.png 1d 1d doc/functions.html 1e 1e doc/functions_rela.html 1f 1f doc/functions_vars.html 20 20 doc/globals.html 21 21 doc/globals_func.html 22 22 doc/havege_8h-source.html 23 23 doc/havege_8h.html 24 24 doc/index.html 25 25 doc/main.html 26 26 doc/md2_8h-source.html 27 27 doc/md2_8h.html 28 28 doc/md4_8h-source.html 29 29 doc/md4_8h.html 2a 2a doc/md5_8h-source.html 2b 2b doc/md5_8h.html 2c 2c doc/muladdc_8h-source.html 2d 2d doc/muladdc_8h.html 2e 2e doc/net_8h-source.html 2f 2f doc/net_8h.html 30 30 doc/rsa_8h-source.html 31 31 doc/rsa_8h.html 32 32 doc/sha1_8h-source.html 33 33 doc/sha1_8h.html 34 34 doc/sha2_8h-source.html 35 35 doc/sha2_8h.html 36 36 doc/ssl__v3_8h-source.html 37 37 doc/ssl__v3_8h.html 38 38 doc/structaes__context-members.html 39 39 doc/structaes__context.html 3a 3a doc/structarc4__context-members.html 3b 3b doc/structarc4__context.html 3c 3c doc/structdes3__context-members.html 3d 3d doc/structdes3__context.html 3e 3e doc/structdes__context-members.html 3f 3f doc/structdes__context.html 40 40 doc/structhavege__state-members.html 41 41 doc/structhavege__state.html 42 42 doc/structhr__time-members.html 43 43 doc/structhr__time.html 44 44 doc/structmd2__context-members.html 45 45 doc/structmd2__context.html 46 46 doc/structmd4__context-members.html 47 47 doc/structmd4__context.html 48 48 doc/structmd5__context-members.html 49 49 doc/structmd5__context.html 4a 4a doc/structmpi-members.html 4b 4b doc/structmpi.html 4c 4c doc/structsha1__context-members.html 4d 4d doc/structsha1__context.html 4e 4e doc/structsha2__context-members.html 4f 4f doc/structsha2__context.html 50 50 doc/timing_8h-source.html 51 51 doc/timing_8h.html 52 52 doc/tree.html 53 53 doc/x509_8h-source.html 54 54 doc/x509_8h.html 55 55 src/CA/server.pem 56 56 src/Doxyfile 57 57 src/bignum.c 58 58 src/bignum.h 59 59 src/dhm.c 5a 5a src/dhm.h 5b 5b src/muladdc.h Syntax: src dest [,src dest [,...]] to move, q to accept, r to redraw: Command: q rm 'src/mpi.c' rm 'src/mpi.h' LOGTEXT Imported xyssl-0.4 into Git repository Merging to master * master upstream Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with b1bb01cd20683c7b6c85795ce573ba4b16015d59 Merging: 870e2c4 Imported xyssl-0.3-1 b1bb01c Imported xyssl-0.4 found 1 common ancestor(s): 3415bee Imported upstream version 0.3 Removing src/mpi.h Merge made by recursive. Makefile | 43 +- NEWS.txt | 13 + TODO.txt | 2 - VS6.mak | 16 +- app/benchmark.c | 255 ++++-- app/rsa_demo.c | 9 +- app/selftest.c | 28 +- app/ssl_client.c | 45 +- app/ssl_server.c | 61 +- doc/aes_8h-source.html | 56 ++ doc/aes_8h.html | 367 ++++++++ doc/annotated.html | 26 + doc/arc4_8h-source.html | 53 ++ doc/arc4_8h.html | 143 +++ doc/base64_8h-source.html | 43 + doc/base64_8h.html | 198 +++++ doc/bignum_8h-source.html | 137 +++ doc/bignum_8h.html | 1610 ++++++++++++++++++++++++++++++++++ doc/des_8h-source.html | 81 ++ doc/des_8h.html | 673 ++++++++++++++ doc/dhm_8h-source.html | 74 ++ doc/dhm_8h.html | 391 ++++++++ doc/doxygen.css | 309 +++++++ doc/doxygen.png | Bin doc/files.html | 32 + doc/ftv2blank.png | Bin doc/ftv2doc.png | Bin doc/ftv2folderclosed.png | Bin doc/ftv2folderopen.png | Bin doc/ftv2lastnode.png | Bin doc/ftv2link.png | Bin doc/ftv2mlastnode.png | Bin doc/ftv2mnode.png | Bin doc/ftv2node.png | Bin doc/ftv2plastnode.png | Bin doc/ftv2pnode.png | Bin doc/ftv2vertline.png | Bin doc/functions.html | 33 + doc/functions_rela.html | 19 + doc/functions_vars.html | 33 + doc/globals.html | 176 ++++ doc/globals_func.html | 176 ++++ doc/havege_8h-source.html | 50 ++ doc/havege_8h.html | 113 +++ doc/index.html | 8 + doc/main.html | 14 + doc/md2_8h-source.html | 58 ++ doc/md2_8h.html | 378 ++++++++ doc/md4_8h-source.html | 57 ++ doc/md4_8h.html | 378 ++++++++ doc/md5_8h-source.html | 57 ++ doc/md5_8h.html | 378 ++++++++ doc/muladdc_8h-source.html | 418 +++++++++ doc/muladdc_8h.html | 90 ++ doc/net_8h-source.html | 56 ++ doc/net_8h.html | 80 ++ doc/rsa_8h-source.html | 125 +++ doc/rsa_8h.html | 664 ++++++++++++++ doc/sha1_8h-source.html | 57 ++ doc/sha1_8h.html | 378 ++++++++ doc/sha2_8h-source.html | 57 ++ doc/sha2_8h.html | 378 ++++++++ doc/ssl__v3_8h-source.html | 222 +++++ doc/ssl__v3_8h.html | 471 ++++++++++ doc/structaes__context-members.html | 16 + doc/structaes__context.html | 102 +++ doc/structarc4__context-members.html | 16 + doc/structarc4__context.html | 102 +++ doc/structdes3__context-members.html | 15 + doc/structdes3__context.html | 77 ++ doc/structdes__context-members.html | 15 + doc/structdes__context.html | 77 ++ doc/structhavege__state-members.html | 18 + doc/structhavege__state.html | 41 + doc/structhr__time-members.html | 14 + doc/structhr__time.html | 29 + doc/structmd2__context-members.html | 17 + doc/structmd2__context.html | 127 +++ doc/structmd4__context-members.html | 16 + doc/structmd4__context.html | 102 +++ doc/structmd5__context-members.html | 16 + doc/structmd5__context.html | 102 +++ doc/structmpi-members.html | 16 + doc/structmpi.html | 102 +++ doc/structsha1__context-members.html | 16 + doc/structsha1__context.html | 102 +++ doc/structsha2__context-members.html | 16 + doc/structsha2__context.html | 102 +++ doc/timing_8h-source.html | 34 + doc/timing_8h.html | 72 ++ doc/tree.html | 117 +++ doc/x509_8h-source.html | 183 ++++ doc/x509_8h.html | 565 ++++++++++++ prj/_build_all.dsp | 8 +- prj/xyssl.dsp | 38 +- src/CA/server.pem | 96 ++ src/Doxyfile | 1218 +++++++++++++++++++++++++ src/aes.c | 91 +- src/aes.h | 68 ++- src/arc4.c | 32 +- src/arc4.h | 36 +- src/base64.c | 56 +- src/base64.h | 55 +- src/{mpi.c => bignum.c} | 765 +++++++---------- src/bignum.h | 385 ++++++++ src/des.c | 69 +- src/des.h | 126 ++- src/dhm.c | 229 +++++ src/dhm.h | 118 +++ src/havege.c | 10 +- src/havege.h | 41 +- src/md2.c | 82 +- src/md2.h | 79 ++- src/md4.c | 85 +- src/md4.h | 77 ++- src/md5.c | 85 +- src/md5.h | 77 ++- src/mpi.h | 345 -------- src/muladdc.h | 411 +++++++++ src/net.c | 30 +- src/net.h | 35 +- src/rsa.c | 165 ++--- src/rsa.h | 198 +++-- src/sha1.c | 87 +- src/sha1.h | 77 ++- src/sha2.c | 95 ++- src/sha2.h | 77 ++- src/ssl_cli.c | 174 +++- src/ssl_srv.c | 159 +++- src/ssl_v3.c | 214 +++-- src/ssl_v3.h | 244 +++--- src/timing.c | 25 +- src/timing.h | 20 +- src/x509.h | 118 ++- src/x509_in.c | 233 +++--- 135 files changed, 16207 insertions(+), 2242 deletions(-) create mode 100644 doc/aes_8h-source.html create mode 100644 doc/aes_8h.html create mode 100644 doc/annotated.html create mode 100644 doc/arc4_8h-source.html create mode 100644 doc/arc4_8h.html create mode 100644 doc/base64_8h-source.html create mode 100644 doc/base64_8h.html create mode 100644 doc/bignum_8h-source.html create mode 100644 doc/bignum_8h.html create mode 100644 doc/des_8h-source.html create mode 100644 doc/des_8h.html create mode 100644 doc/dhm_8h-source.html create mode 100644 doc/dhm_8h.html create mode 100644 doc/doxygen.css create mode 100644 doc/doxygen.png create mode 100644 doc/files.html create mode 100644 doc/ftv2blank.png create mode 100644 doc/ftv2doc.png create mode 100644 doc/ftv2folderclosed.png create mode 100644 doc/ftv2folderopen.png create mode 100644 doc/ftv2lastnode.png create mode 100644 doc/ftv2link.png create mode 100644 doc/ftv2mlastnode.png create mode 100644 doc/ftv2mnode.png create mode 100644 doc/ftv2node.png create mode 100644 doc/ftv2plastnode.png create mode 100644 doc/ftv2pnode.png create mode 100644 doc/ftv2vertline.png create mode 100644 doc/functions.html create mode 100644 doc/functions_rela.html create mode 100644 doc/functions_vars.html create mode 100644 doc/globals.html create mode 100644 doc/globals_func.html create mode 100644 doc/havege_8h-source.html create mode 100644 doc/havege_8h.html create mode 100644 doc/index.html create mode 100644 doc/main.html create mode 100644 doc/md2_8h-source.html create mode 100644 doc/md2_8h.html create mode 100644 doc/md4_8h-source.html create mode 100644 doc/md4_8h.html create mode 100644 doc/md5_8h-source.html create mode 100644 doc/md5_8h.html create mode 100644 doc/muladdc_8h-source.html create mode 100644 doc/muladdc_8h.html create mode 100644 doc/net_8h-source.html create mode 100644 doc/net_8h.html create mode 100644 doc/rsa_8h-source.html create mode 100644 doc/rsa_8h.html create mode 100644 doc/sha1_8h-source.html create mode 100644 doc/sha1_8h.html create mode 100644 doc/sha2_8h-source.html create mode 100644 doc/sha2_8h.html create mode 100644 doc/ssl__v3_8h-source.html create mode 100644 doc/ssl__v3_8h.html create mode 100644 doc/structaes__context-members.html create mode 100644 doc/structaes__context.html create mode 100644 doc/structarc4__context-members.html create mode 100644 doc/structarc4__context.html create mode 100644 doc/structdes3__context-members.html create mode 100644 doc/structdes3__context.html create mode 100644 doc/structdes__context-members.html create mode 100644 doc/structdes__context.html create mode 100644 doc/structhavege__state-members.html create mode 100644 doc/structhavege__state.html create mode 100644 doc/structhr__time-members.html create mode 100644 doc/structhr__time.html create mode 100644 doc/structmd2__context-members.html create mode 100644 doc/structmd2__context.html create mode 100644 doc/structmd4__context-members.html create mode 100644 doc/structmd4__context.html create mode 100644 doc/structmd5__context-members.html create mode 100644 doc/structmd5__context.html create mode 100644 doc/structmpi-members.html create mode 100644 doc/structmpi.html create mode 100644 doc/structsha1__context-members.html create mode 100644 doc/structsha1__context.html create mode 100644 doc/structsha2__context-members.html create mode 100644 doc/structsha2__context.html create mode 100644 doc/timing_8h-source.html create mode 100644 doc/timing_8h.html create mode 100644 doc/tree.html create mode 100644 doc/x509_8h-source.html create mode 100644 doc/x509_8h.html create mode 100644 src/CA/server.pem create mode 100644 src/Doxyfile rename src/{mpi.c => bignum.c} (67%) create mode 100644 src/bignum.h create mode 100644 src/dhm.c create mode 100644 src/dhm.h delete mode 100644 src/mpi.h create mode 100644 src/muladdc.h Merged version 0.4 of ../xyssl-0.4.tgz into . sipang ..ages/xyssl/tmp/xyssl/xyssl% ls src/mpi.{c,h} 23:00 ls: src/mpi.h: No such file or directory src/mpi.c sipang ../xyssl/tmp/xyssl/xyssl (2)% rm src/mpi.c 23:00 sipang ..ages/xyssl/tmp/xyssl/xyssl% git checkout -f master 23:00 sipang ..ages/xyssl/tmp/xyssl/xyssl% ls src/mpi.c 23:00 ls: src/mpi.c: No such file or directory sipang ../xyssl/tmp/xyssl/xyssl (2)% 23:00
