On Sun, May 1, 2011 at 11:45, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: >> # 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... You're right, I had Inno Setup running in the background, probably locking the ISCmplr.dll. But even after closing Inno Setup and making sure ISCmplr.dll is not locked anymore, the above cherry-pick fails. However, if I pass --strategy=resolve, it works with 1.7.5. But as you already mentioned, I'd not expect the cherry-pick to touch ISCmplr.dll in any case ... no what does that tell me, is it a regression in 1.7.5, or a new "feature"? -- Sebastian Schuberth -- 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