Niemann, Hartmut wrote on Wed, Nov 28, 2012 at 12:42:44 +0100: > So at least it looks like a newer working copy can not be overwritten > incidentially by the restored (older) HEAD revision.
It's not that simple --- once you commit 11 revisions to the restored repository, you'll get some... interesting errors. > > But how should one recover in such a situation? > Is a fresh checkout and a manual merge necessary? > Yes. And change the UUID of the recovered repository --- to account for the problem above (basically, post-r110 history forked).
