Package: git-core Version: 1:1.5.1-1 Severity: normal Here is what happen :
$ git cherry-pick 98b869784f22508f870ebce086dd7ce23bb4b5dd fatal: Untracked working tree file 'lib/authenticated_system.rb' would be overwritten by merge. Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git-add <paths>' and commit the result. When commiting, use the option '-c 98b8697' to retain authorship and message. $ git diff HEAD..98b869784f22508f870ebce086dd7ce23bb4b5dd lib/authenticated_system.rb $ So this file existe in both HEAD and 98b8697, is identical in both version, but git failed telling me it's untracked. Note also that a git diff 98b869784f22508f870ebce086dd7ce23bb4b5dd^..98b869784f22508f870ebce086dd7ce23bb4b5dd | git apply will be successfull -- System Information: Debian Release: 4.0 APT prefers testing APT policy: (650, 'testing'), (600, 'unstable'), (550, 'experimental') Architecture: amd64 (x86_64) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-4-amd64 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Versions of packages git-core depends on: ii libc6 2.3.6.ds1-13 GNU C Library: Shared libraries ii libcurl3-gnutls 7.15.5-1 Multi-protocol file transfer libra ii libdigest-sha1-perl 2.11-1 NIST SHA-1 message digest algorith ii liberror-perl 0.15-8 Perl module for error/exception ha ii libexpat1 1.95.8-3.4 XML parsing C library - runtime li ii perl-modules 5.8.8-7 Core Perl modules ii zlib1g 1:1.2.3-13 compression library - runtime Versions of packages git-core recommends: ii curl 7.15.5-1 Get a file from an HTTP, HTTPS, FT ii git-doc 1:1.4.4.4-2 content addressable filesystem (do ii less 394-4 Pager program similar to more ii openssh-client [ssh-client] 1:4.3p2-9 Secure shell client, an rlogin/rsh ii patch 2.5.9-4 Apply a diff file to an original ii rsync 2.6.9-2 fast remote file copy program (lik -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
