[petsc-dev] Commit collision/corruption?

[Sean Farley]

Jed Brown writes:

> On Wed, Mar 6, 2013 at 5:25 PM, Sean Farley <sean at mcs.anl.gov> wrote:
>
>> This right here is the most suspect part. The minute you start monkeying
>> around with private functions and whatnot, you are in the danger zone. I
>> will have a hard time believing this isn't a bug in gitifyhg. In fact, I
>> am willing to bet on it.
>>
>
> This commit took place before anything else. Can you explain the
> zero-content files?
>
> https://bitbucket.org/BarryFSmith/petsc-dev-simp/commits/de73c9a7d341d846b5e16a8d61a48242f0521c02
>
> Run 'hg export de73c9a7d341d846b5e16a8d61a48'. Note how they do not exist
> in the formatted patch. Why are they written into the commit?

I don't see this. I see contents for both of Barry's merges. You'll have
to provide a test case where this happens to rule out gitifyhg.