how to *really* revert?

[Mark Williamson]

> I want to sync a tree completely with upstream to resync some changes.  I'm
> confused as to how I do this without just a new clone (which takes 30
> minutes).

Side note, if you use the seed tarball on the Xen downloads page, you can 
speed this up quite a bit.  I usually just maintain a pristine "incoming" 
tree and then clone that locally (which uses hardlinking, so it's fast and 
space efficient).

> dargo:~/xen-unstable.hg> hg pull
> pulling from http://xenbits.xensource.com/xen-unstable.hg
> searching for changes
> no changes found
> dargo:~/xen-unstable.hg> hg diff
> dargo:~/xen-unstable.hg> hg update
> aborting: outstanding uncommitted merges
> dargo:~/xen-unstable.hg> hg revert
> dargo:~/xen-unstable.hg> hg update
> aborting: outstanding uncommitted merges
>
> If I do an hg commit, there are in fact 4 files that it wants to commit.
> Why aren't they showing up in hg diff or why isn't hg revert getting rid of
> those?

Does hg status give any interesting information?  Have you committed anything 
to your repository?

Cheers,
Mark