Hi, sorry for the late reply. On Thu, Apr 05, 2007 at 09:16:15AM +0200, R??mi Vanicat wrote: > 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
I failed to reproduce this from your description. Can you please check whether you still have the problem with the most recent version git-core 1:1.5.2.1-1, and if so, construct a simple test case that reproduces the problem? Thanks, Gerrit. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
