git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org
Subject: Re: git rebase bug?
Date: Wed, 7 Jul 2010 20:00:04 +0200	[thread overview]
Message-ID: <20100707180004.GA3165@atjola.homenet> (raw)
In-Reply-To: <20100707150545.GA24814@glandium.org>

On 2010.07.07 17:05:45 +0200, Mike Hommey wrote:
> See how the security/manager/ssl/public/nsIBadCertListener.idl file that
> was created by the original patch is created as
> xulrunner/examples/simple/content/contents.rdf.

The "problem" is that nsIBadCertListener.idl wasn't actually created by
the cherry-picked commit, but was modified. It was an empty file before,
created in 4292283190983fa91b875e22664a79a3aa9ea45d.

And as nsIBadCertListener.idl is missing from the xulrunner/2.0 branch,
git does the usual rename detection, finding another empty file and ends
up patching that one instead.

Björn

  reply	other threads:[~2010-07-07 18:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07 15:05 git rebase bug? Mike Hommey
2010-07-07 18:00 ` Björn Steinbrink [this message]
2010-07-07 20:51   ` Mike Hommey
2010-07-07 21:44     ` Jakub Narebski
2010-07-08  9:47       ` Mike Hommey
2010-07-08 11:37       ` Jeff King

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=20100707180004.GA3165@atjola.homenet \
    --to=b.steinbrink@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=mh@glandium.org \
    /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).