From: Sebastian Schuberth <sschuberth@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: msysgit@googlegroups.com, git@vger.kernel.org
Subject: Re: [msysGit] Strange cherry-picking issue with 1.7.5.msysgit.1.1.g05d0e
Date: Sun, 1 May 2011 12:02:03 +0200 [thread overview]
Message-ID: <BANLkTik1eYsz2eBkkUGM1XRVTOg8XEXnRQ@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.1105011138020.13761@bonsai2>
On Sun, May 1, 2011 at 11:45, Johannes Schindelin
<Johannes.Schindelin@gmx.de> 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
prev parent reply other threads:[~2011-05-01 10:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-01 8:28 Strange cherry-picking issue with 1.7.5.msysgit.1.1.g05d0e Sebastian Schuberth
2011-05-01 9:45 ` Johannes Schindelin
2011-05-01 10:02 ` Sebastian Schuberth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTik1eYsz2eBkkUGM1XRVTOg8XEXnRQ@mail.gmail.com \
--to=sschuberth@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).