When a Mercurial repo no longer contains a subrepository in a folder named "Foo" and instead has actual files in "Foo"...

You are going to have to delete the .hg folder in "Foo" before you may pull down the revision that does away with the subrepository.