From: Mike Hommey Date: Wed, 07 Jul 2010 20:51:26 GMT Subject: Re: git rebase bug? Message-ID: <20100707205126.GA11240@glandium.org> In-Reply-To: <20100707180004.GA3165@atjola.homenet> On Wed, Jul 07, 2010 at 08:00:04PM +0200, Björn Steinbrink wrote: > 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. Oh, makes sense. Thanks. So that's a quite troubling corner case... I wonder if empty files shouldn't be special cased... Mike