[petsc-dev] I hate Mecurial

[Barry Smith]

barry-smiths-macbook-pro:proposal barrysmith$ hg pull
http authorization required
realm: fusionMaterials Hg repository
user: barrysmith
password: 
pulling from https://software.lanl.gov/fusionMaterials/hg/scidac11
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 3 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
barry-smiths-macbook-pro:proposal barrysmith$ hg merge
abort: outstanding uncommitted changes (use 'hg status' to list changes)
barry-smiths-macbook-pro:proposal barrysmith$ hg status
! proposal/.#bios.tex
? mynotes
? proposal/configure.tex
? proposal/pmi-scidac.pdf
? proposal/proposal.aux
? proposal/proposal.bbl
? proposal/proposal.blg
? proposal/proposal.log
? proposal/proposal.out
? proposal/proposal.pdf
? proposal/proposal.toc
? proposal/solvers.aux
barry-smiths-macbook-pro:proposal barrysmith$ hg commit
nothing changed
barry-smiths-macbook-pro:proposal barrysmith$ hg heads
changeset:   31:e3982f4e4c25
tag:         tip
user:        David E. Bernholdt <bernholdtde at ornl.gov>
date:        Sat Oct 08 13:29:38 2011 -0400
files:       proposal/bios/chan.doc proposal/bios/chan.pdf
description:
Added Vincent Chan bio


changeset:   29:7556af627d57
user:        Barry Smith <bsmith at mcs.anl.gov>
date:        Sat Oct 08 12:27:28 2011 -0500
files:       proposal/bios/constantinescu.tex proposal/bios/smith.tex proposal/narrative/ascr.tex proposal/narrative/solvers.tex proposal/other-support/constantinescu.tex
description:
added solvers subsection
added emil's bio and c and p




What the fuck? Why cannot it not provide some useful information on what I need to do??????  This absolutely sucks!!!!

   Barry