{"thread":{"id":"26550","subject":"Directory replaced with a file confuses cherry-pick","startedAt":"2011-02-18T14:24:14Z","lastAt":"2011-02-18T14:27:11Z","messageCount":2,"participants":["Alexey Feldgendler"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"161547","messageId":"op.vq3rmo2b56e9f9@xman.eng.oslo.osa","threadId":"26550","inReplyTo":null,"subject":"Directory replaced with a file confuses cherry-pick","fromName":"Alexey Feldgendler","fromEmail":"alexeyf@opera.com","sentAt":"2011-02-18T14:24:14Z","receivedAt":"2011-02-18T14:24:14Z","isPatch":false,"sender":{"key":"alexeyf@opera.com","avatar":null},"body":"\nHello!\n\nI think I've found a bug. Here is how to reproduce.\n\n1. Create an empty repo.\n2. Add the following: file.txt containing \"before\" and directory problem/\nwith file problem/content containing \"data\". Commit this.\n3. From here, create a branch and commit a change to file.txt: change it\nto say \"after\".\n4. Checkout master.\n5. Remove directory problem/ and add a file with the same name (problem)\ncontaining \"newdata\". Commit this.\n6. Try to cherry-pick the commit you made on the side branch on step 3.\n\nHere is what you see:\n\nAutomatic cherry-pick failed.  After resolving the conflicts,\nmark the corrected paths with 'git add <paths>' or 'git rm <paths>'\nand commit the result with:\n\n           git commit -c 64f21a85fa3deb4d3952b0471f442a76e5147b05\n\nAnd git-status says:\n\n# On branch master\n# Changes to be committed:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#\n#       modified:   file.txt\n#\n# Unmerged paths:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#   (use \"git add/rm <file>...\" as appropriate to mark resolution)\n#\n#       added by us:        problem\n#\n# Untracked files:\n#   (use \"git add <file>...\" to include in what will be committed)\n#\n#       problem~HEAD\n\nExpected result: the cherry-pick goes smoothly. The change I'm\ncherry-picking (modification of file.txt) has nothing to do with the\nproblem file/directory. Trying to cherry-pick anything from branches that\nstem off from before the change of a directory to a file fails like this.\n\nKnown? Is replacing directories with files maybe a taboo?\n\n\n-- \nAlexey Feldgendler\nSoftware Developer, Desktop Team, Opera Software ASA\n[ICQ: 115226275] http://my.opera.com/feldgendler/\n"},{"id":"161548","messageId":"op.vq3rrlv456e9f9@xman.eng.oslo.osa","threadId":"26550","inReplyTo":"op.vq3rmo2b56e9f9@xman.eng.oslo.osa","subject":"Re: Directory replaced with a file confuses cherry-pick","fromName":"Alexey Feldgendler","fromEmail":"alexeyf@opera.com","sentAt":"2011-02-18T14:27:11Z","receivedAt":"2011-02-18T14:27:11Z","isPatch":false,"sender":{"key":"alexeyf@opera.com","avatar":null},"body":"On Fri, 18 Feb 2011 15:24:14 +0100, Alexey Feldgendler <alexeyf@opera.com>  \nwrote:\n\n> I think I've found a bug. Here is how to reproduce.\n\nSorry for the dupe. Mailer screwup.\n\n\n-- \nAlexey Feldgendler\nSoftware Developer, Desktop Team, Opera Software ASA\n[ICQ: 115226275] http://my.opera.com/feldgendler/\n"}]}