cherry-pick fail when a symbolic link has been changed into a file or directory

I'm reposting this since I didn't get any responses and I think my message didn't contained enought context.

I think I may have spotted a bug, or a unhandled case when doing a cherry-pick

Consider a repository like this:

# Initialize a dummy repository
   mkdir -p repo1 ; cd repo1
   git init .

# Create a new directory dir1' and a link to it dir2' mkdir dir1
   echo file1 > dir1/file1
   ln -s dir1 dir2
   git add dir1 dir2
   git commit -m "Initial status: dir2 -> dir1"

# Create a branch named test1' remove the dir2' link and

# replace it by a new directory
   git checkout -b test1
   git rm dir2
   mkdir dir2
   touch file2 > dir2/file1
   git add dir2/file1
   git commit -m "Removing link: dir1/ and dir2/"

# Now create a new file in `test1' branch
   message="New file in test1"
   echo $message > new_file_test1
   git add new_file_test1
   git commit -m "$message"

# Now try to cherry-pick last commit from `test1' into master git co master
   git cherry-pick test1

The cherry-pick fails saying if failed to merge dir2' despite the fact that the commit doesn't affect dir2' and

git diff test1~..test1 | git apply

is working. Am I doing something wrong ?

--
Camille Moncelier
http://devlife.org

--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Could you try to cherry-pick with other strategies? For example with:

git cherry-pick --strategy resolve test1

I remember there were some problems with the default "recursive" strategy and I am not sure they were fixed.
By the way could you tell which version of git you are using?

Thanks,
Christian.

Quoted 4 lines · On Thu, 4 Nov 2010 14:55:12 +0100 Christian Couder…

Could you try to cherry-pick with other strategies? For example with:

git cherry-pick --strategy resolve test1

~/repo1$ git --version
git version 1.7.3.1

~/repo1$ git cherry-pick --strategy resolve test1
Trying simple merge.
Simple merge failed, trying Automatic merge.
[master da2d5bf] New file in test1

 1 files changed, 1 insertions(+),

 create mode 100644 new_file_test1

Seems it is working using the resolve strategy. I may have found a message on this list posted a while ago:

"cherry-picking a commit clobbers a file which is a directory in the target commit"

Which seems to deal with the same kind of problems maybe something is missing in the patch in order to handle this particular case.

Please reply not only to me but also to the list and add relevant people in Cc: like I did.

Elijah Newren sent a patch series around September the 20th but I did not check to see if this series was merged into pu, next or master. And I don't know if it fixes your problem.
Could you have a look?

Thanks,
Christian.

Quoted 2 lines · On Thu, 4 Nov 2010 18:03:39 +0100 Christian Couder…

Please reply not only to me but also to the list and add relevant people in Cc: like I did.

It replied to the list[1] and CC'ed you. I use claws mail + gmane NNTP gateway. Maybe I did something wrong but it seems that the message has been successfully delivered to the list.

[1] http://article.gmane.org/gmane.comp.version-control.git/160722

Hi,

Sorry, I've been missing in action for about a month, but I'll have some time this weekend to catch back up on git stuff...

Quoted 9 lines · Camille Moncelier

Quoted 4 lines · On Thu, 4 Nov 2010 18:03:39 +0100 Christian Couder…

Elijah Newren sent a patch series around September the 20th but I did not check to see if this series was merged into pu, next or master. And I don't know if it fixes your problem.
Could you have a look?

I think I already took a look last week, and I think they were merged in 1.7.1 or 1.7.2 although I'm not sure. I'll take another look. This evening or maybe tomorrow.

The patch series I posted in late September post-dates the related series of mine that were merged in 1.7.3.

I'd also be happy to take a look and see if my newer merge-recursive series fixes your case (or whether one of my other improvements to that series since my September posting does).  If not, I'll track it down and fix it and add that fix to the series.

Quoted 7 lines

The patch series I posted in late September post-dates the related series of mine that were merged in 1.7.3.

I'd also be happy to take a look and see if my newer merge-recursive series fixes your case (or whether one of my other improvements to that series since my September posting does).  If not, I'll track it down and fix it and add that fix to the series.

Great!

Thanks both,
Christian.

BTW, Is there a way using git bisect to find the "last bad commit", or maybe the "first good one" ?

Could you try to cherry-pick with other strategies? For example with:

git cherry-pick --strategy resolve test1

I remember there were some problems with the default "recursive" strategy and I am not sure they were fixed.
By the way could you tell which version of git you are using?

Quoted 54 lines · Camille Moncelier

I'm reposting this since I didn't get any responses and I think my message didn't contained enought context.

I think I may have spotted a bug, or a unhandled case when doing a cherry-pick

Consider a repository like this:

# Initialize a dummy repository
   mkdir -p repo1 ; cd repo1
   git init .

# Create a new directory dir1' and a link to it dir2' mkdir dir1
   echo file1 > dir1/file1
   ln -s dir1 dir2
   git add dir1 dir2
   git commit -m "Initial status: dir2 -> dir1"

# Create a branch named test1' remove the dir2' link and

# replace it by a new directory
   git checkout -b test1
   git rm dir2
   mkdir dir2
   touch file2 > dir2/file1
   git add dir2/file1
   git commit -m "Removing link: dir1/ and dir2/"

# Now create a new file in `test1' branch
   message="New file in test1"
   echo $message > new_file_test1
   git add new_file_test1
   git commit -m "$message"

# Now try to cherry-pick last commit from `test1' into master git co master
   git cherry-pick test1

The cherry-pick fails saying if failed to merge dir2' despite the fact that the commit doesn't affect dir2' and

git diff test1~..test1 | git apply

is working. Am I doing something wrong ?

--
Camille Moncelier
http://devlife.org

--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html