screwed up repo, i have no clue how i did it & how to solve it

[Matt Mackall]

On Wed, 2013-01-30 at 21:34 +0100, Roland Schmitz wrote:
> > Please see Matt's earlier e-mail:
> Ups, i missed it, sorry
>  
> > On Jan 29, 2013, at 2:51 PM, Matt Mackall wrote:
> > > You are right in thinking something is odd here.
> > > 
> > > Please send the output of:
> > > 
> > > hg version
> > > hg sum (with tip checked out)
> > > hg heads -t
> > > hg heads -c
> > > hg log --debug tip
> > > cat .hg/cache/branchheads
> > 
> > pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
> > Kevin R. Bullock
> Here's the output:
> 
> $ hg version
> Mercurial Distributed SCM (version 2.2.2)

Ok.

> $ hg sum
> Vorgänger: 150:716dbb383599 
>  Tab funktioniert jetzt auch mit mehreren Key Spalten
> Zweig: default
> Übernehme: 3 unbekannt (clean)
> Aktualisiere: (aktuell)

Ok.

> $ hg heads -t
> Änderung:        152:f3ebeb800e91
> Marke:           tip
> Vorgänger:       149:b812a484bb66
> Nutzer:          Roland Schmitz <roland-schmitz at gmx.de>
> Datum:           Mon Jan 28 20:32:50 2013 +0100                                                                                                                                                 
> Zusammenfassung: Head mit id 149 geschlossen                                                                                                                                                    

Ok, I guess this means "head with id 149 closed".

So "tip" is indeed a closed branch head, which was not entirely clear
from your original report.

"Tip" in Mercurial is simply the highest-numbered commit. "Tip" will
thus be "fixed" the next time you do a commit. Ancient Mercurial used
this concept as an alias for "the most interesting repository head" but
that ceases to apply when you start using named branches or
--close-branch. 

I recommend you erase "tip" and "hg tip" from your vocabulary and
instead replace it in your mind with "default" and "hg heads". When you
give "default" as a revision (eg "hg up default"), you implicitly refer
to the highest-numbered, non-closed head on the default branch.

We will probably remove "tip" from the list of advertised commands in
the near future.

-- 
Mathematics is the supreme nostalgia of our time.