In main, resolving.

I have pushed this to crew as 204c7850c158.

Well, there are cases where you can still rollback after stripping, for example,
a side branch (while the latest commit was against your normal branch). On the
other hand, removing undo after strip extracts that from all the callers, which
is kind of nice. Maybe make it an option for strip?

Patch sent to mercurial-devel, thanks.

http://article.gmane.org/gmane.comp.version-control.mercurial.devel/18002

Matt, should we consider disallow rollback after every strip operation in general?

Correcting title, as the repo itself is intact

I've reproduced the behavior with the following script:

#!/bin/sh
rm -rf a
hg init a
cd a

echo 0 > a
hg ci -Am0
echo 1 > a
hg ci -Am0
hg co 0
echo 2 > b
hg ci -Am1
hg co -C 1
hg rebase
hg rollback
hg st
hg verify

To fix a repo in this state, use "hg debugrebuildstate -r tip".

You can't actually meaningfully 'roll back' a rebase because rebase
destructively modifies history. But nonetheless, we should avoid hitting this
case by removing .hg/store/undo before and after a strip operation.

Rolling back after doing a rebase has (repeatably) left me with a repo that can't 
be used because of errors like this:
abort: unknown revision '8993e0272dec2bbd9d60b6124e74d97a1dd5a1c6'!