Can anyone tell me what this Mercurial error means?
untracked file in working directory differs from file in requested revision
If using TortoiseHG you can check the "Discard local changes, no backup" option in the Update window.