On Thu, Jun 07, 2007 at 11:52:19AM +0200, Remi Vanicat wrote: > how to reproduce : > create a repos with a link in it, then in a branch, remove the link, > and add a directory in place of the link (same name). > > Then try to cherry pick a commit from a branch where there is the > directory into a branch where there is the link : it failed even if > the modification ave nothing to do with said link/directory. Hi, please see http://bugs.debian.org/417885 This is how I can reproduce the conflict, and I too didn't expect that. The link/dir that conflicts is not changed in the commit that's cherry-pick'ed: $ mkdir repo && cd repo $ git init Initialized empty Git repository in .git/ $ echo foo >file $ ln -s dangling link $ git add . $ git commit -mfoo Created initial commit c6a9189: foo 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 file create mode 120000 link $ git checkout -b branch Switched to a new branch "branch" $ git rm link rm 'link' $ git commit -mremovelink Created commit 2c60f15: removelink 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 120000 link $ mkdir link $ echo bar >link/file $ git add link $ git commit -m adddir Created commit d3b30b5: adddir 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 link/file $ echo bar >>file $ git commit -mfile file Created commit 8ddc4d5: file 1 files changed, 1 insertions(+), 0 deletions(-) $ git checkout master Switched to branch "master" $ git cherry-pick 8ddc4d5 CONFLICT (file/directory): There is a directory with name link in 8ddc4d5... file. Added link as link~HEAD 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 8ddc4d5' to retain authorship and message. $ Thanks, Gerrit. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
