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

[Becker, Mischa J]

> -----Original Message-----
> From: Harvey Chapman [mailto:hchapman-hg at 3gfp.com]
> Sent: Tuesday, January 29, 2013 12:31 PM
> To: Becker, Mischa J
> Cc: Roland Schmitz; mercurial at selenic.com
> Subject: Re: screwed up repo, i have no clue how i did it & how to solve
> it
>
> On Jan 29, 2013, at 2:53 PM, "Becker, Mischa J"
> <mischa.becker at fredmeyer.com> wrote:
>
> >> $ hg heads
> >> Änderung:        150:716dbb383599
> >> Vorgänger:       147:6c015687d9af
> >> Nutzer:          Roland Schmitz <roland-schmitz at gmx.de>
> >> Datum:           Mon Jan 28 20:31:26 2013 +0100
> >> Zusammenfassung: Tab funktioniert jetzt auch mit mehreren Key
> Spalten
> >
> > Both revs 150 & 152 are heads.
>
> Then why isn't 152 listed above after "hg heads"?  (Or was the output
> abridged in the original email?)

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.

Mischa

________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.