Re: Strange cherry-picking issue with 1.7.5.msysgit.1.1.g05d0e

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 1, 2011, 09:45 UTC
Message-ID: <alpine.DEB.1.00.1105011138020.13761@bonsai2>
In-Reply-To: <ipj5k5$j04$1@dough.gmane.org>

Hi,

On Sun, 1 May 2011, Sebastian Schuberth wrote:

Show 42 quoted lines

> while preparing for the msysGit 1.7.5 release, I came across a strange 
> issue with cherry-picking when using my own local build of 
> 1.7.5.msysgit.1.1.g05d0e (built from the msysgit.git / 4msysgit.git 
> devel branches; note that 4msysgit.git's devel is based on git.git's aka 
> Junio's next).
> 
> To test the recent "BindImage" additions to the Windows installer, I 
> did:
> 
> # Create a topic branch based on msysgit.git devel:
> sebastian@PASSAU / (devel)
> $ git checkout -b ss/bindimage
> M       git
> Switched to a new branch 'ss/bindimage'
> 
> # Cherry-pick the "BindImage" commit from msysgit.git's mob:
> sebastian@PASSAU / (ss/bindimage)
> $ git cherry-pick 59467863efd336ba3a443a88ce140ab1e59a29f0
> error: could not apply 5946786... Call BindImage on installer for all the exe and dll files
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
> 
> # Inspect the working tree:
> sebastian@PASSAU / (ss/bindimage|CHERRY-PICKING)
> $ git status
> # On branch ss/bindimage
> # Changes to be committed:
> #
> #       modified:   share/WinGit/copy-files.sh
> #       modified:   share/WinGit/install.iss
> #
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working directory)
> #
> #       modified:   git (new commits)
> #
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       share/InnoSetup/ISCmplr.dll~5946786... Call BindImage on installer for all the exe and dll files

This looks like some problem trying to check out that file from another branch. Since you say that this problem does not occur when starting from the 1.7.4 tag, and you updated ISCmplr.dll 6 days after that, I could imagine that something locks the .dll. After all, the current 'mob' is still based off of 1.7.4 not off of the current 'devel'.

There should not have been a problem, though, as the .dll has not changed between the merge base and 5946786...

FWIW on Linux, the same cherry-pick works just fine.

Ciao, Dscho