On Dec 20, 2012, at 10:26 PM, Sean Farley <sean at mcs.anl.gov> wrote:
> On Thu, Dec 20, 2012 at 10:23 PM, Sean Farley <sean at mcs.anl.gov> wrote: >> On Thu, Dec 20, 2012 at 10:15 PM, Barry Smith <bsmith at mcs.anl.gov> wrote: >>> > > P.P.S. - If you have no changes in SCALAPACK.py (actually, it should > be ScaLAPACK) then just delete the file and run `hg revert > config/PETSc/packages/scalapack.py` rm config/PETSc/packages/SCALAPACK.py Barrys-MacBook-Pro:petsc-dev barrysmith$ hg revert config/PETSc/packages/scalapack.py config/PETSc/packages/scalapack.py: no such file in rev 081d7404b837 reverting config/PETSc/packages/SCALAPACK.py Barrys-MacBook-Pro:petsc-dev barrysmith$ hg merge abort: case-folding collision between config/PETSc/packages/scalapack.py and config/PETSc/packages/SCALAPACK.py But simply doing hg mv SCALAPACK.py scalapack.py ; hg commit; hg merge; hg commit; did work.
