how to *really* revert?

[Sean Dague]

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).

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?

	-Sean

-- 
__________________________________________________________________

Sean Dague                                       Mid-Hudson Valley
sean at dague dot net                            Linux Users Group
http://dague.net                                 http://mhvlug.org

There is no silver bullet.  Plus, werewolves make better neighbors
than zombies, and they tend to keep the vampire population down.
__________________________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20050809/2a9853da/attachment-0001.asc>