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

[Roland Schmitz]

Hi *,

if i try to merge i get:
$ hg merge 
Abbort: Branch 'default' has one head - please choose one explicit revision
('hg heads' show all heads)

If i invoke hg heads i get:
hg heads
change:        150:716dbb383599
parent:       147:6c015687d9af
...

How do i merge, and what do i have to merge?
I can first answer any further questions on saturday. Till then i'm probaby 
offline, but defenetly not in front of this computer.

Yours

Roland

Am Mittwoch, 30. Januar 2013 schrieb roland schmitz:
> Hi Mischa, hi *,
> 
> > Either the output was abridged, or tip is a closed head. I was assuming
> > the former but rereading the original email makes me think it is probably
> > the latter.  Push doesn't care if the head is open or closed, it just
> > cares if it is going to push another head.
> > 
> > It looks to me like he closed all of his extra heads but since they
> > weren't merged into the open head, they still exist as heads and
> > therefore push is complaining.
> 
> is there a way to merge "everything" that way, that the code i have
> actually in my repo/on my disk will be the one which lasts? This would be
> my first merge ever ;-}
> 
> Yes, i'm the only user of this repo.
> 
> Yours
> 
> Roland
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial


-- 
Mit freundlichem Gruss    Yours sincerely

  Roland Schmitz