[petsc-dev] petsc-dev repo

[Satish Balay]

If you've pulled petsc-dev in the past couple of hours - you might
have some hg errors like:

>>>>>>
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
<<<<<<

If so - suggest doing:

hg rollback

[or alternatively]
mv petsc-dev petsc-dev.old
hg clone petsc-dev.old petsc-dev -r d3e10315d68b
cp petsc-dev.old/.hg/hgrc petsc-dev/.hg/hgrc

I've manually removed this bad state from
petsc.cs.iit.edu/petsc/petsc-dev - so if you pull now - its ok [i.e
you won't see the 2 heads with 'hg heads']

Satish