histedit + rollback destroys working copy

Dominik Psenner dpsenner at gmail.com
Wed Mar 2 02:57:48 CST 2011


Hi,

I most probably was able to produce a workflow that nukes a repository
because hg keeps complaining about "unknown parent revision" without letting
me do anything to change that. Whatever I want to do on the working copy
(up, shelve, ..), hg keeps complaining:

$ hg up null
Abbruch: Arbeitsverzeichnis hat unbekannte Vaterversion '7153d5bf1703'!

So, what I did was:

* at "tip-2" I committed a partial fix
* at "tip-1" I committed the second part of the fix
* then I told histedit to fold tip and "tip-1" into one commit
* now the previous "tip-2" became a new changeset too
	=> this could have been my fault, I am unsure if I marked "tip-1" or
"tip" to fold
* at this point I started a rollback which removed the changesets tip,
"tip-1" and the new "tip-2" leaving my local changes intact
* and here I am with a working copy that has a unknown parent

Is someone able to reproduce this?

Greetings,
D.



More information about the Mercurial-devel mailing list