screwed up repo, i have no clue how i did it & how to solve it
Roland Schmitz
roland-schmitz at gmx.de
Tue Jan 29 17:28:18 UTC 2013
Hi together,
i screwed up my mercurial repository, but i did not know how. I was working
with it since 2006 without problems, but now i broke something. I can't
remember what i did to get to this point.
Some weeks ago i get the message that i can't push my repo to sourceforge, the
message somesthing like "Abort: push will create a new remote head xyz
((Did you forgett to merge? Use push -f to force))"
After this i noticed my repo had 9 heads, by using "hg heads". But there was
just the "default" branch, so i thougt there is nothing to merge. After some
searching i found:
$ hg update -r 149
$ hg commit --close-branch -m 'Head mit id 149 geschlossen'
$ hg update -C default
I was lucky, all "8 old" heads closed, but as i noticed today, that's not the
solution.
Actual i have:
$ hg tip
Ä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
$ 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
What i can see is that hg tip tells me that rev 152 is my tip, but 150 is my
head.
I hope someone can help me to understand what my error was to get to this
situation, und next, to solve it.
Translation: Änderung = Change, Vorgänger = parent, Nutzer = user, Datum =
date, Zusammenfassung = Merge comment
--
Mit freundlichem Gruss Yours sincerely
Roland Schmitz
More information about the Mercurial
mailing list