[petsc-dev] Commit collision/corruption?

Sean Farley sean at mcs.anl.gov
Wed Mar 6 19:08:51 CST 2013


Jed Brown writes:

> On Wed, Mar 6, 2013 at 6:34 PM, Sean Farley <sean at mcs.anl.gov> wrote:
>
>> > 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.
>
>
> Look for changes to src/mat/impls/aij/seq/ftn-kernels/*.h.
>
> This all happened before I was involved.

You'll have to provide a test case. Also, all the petsc devs might as
well use this time to upgrade their mercurial to the latest (2.5.2 at
the time of this writing).



More information about the petsc-dev mailing list