confusing pull -u behavior

[Neal Becker]

$ hg pull -u
pulling from ssh://nbecker1/scma-ldpc1_9-fixed
searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 6 changes to 4 files
abort: untracked file in working directory differs from file in requested 
revision: 'test/run-tests-aci.py'

OK, get rid of local version
$ rm run-tests-aci.py

Now try again
$ hg pull -u
pulling from ssh://nbecker1/scma-ldpc1_9-fixed
searching for changes
no changes found

$ ls -l run-tests-aci.py
ls: cannot access run-tests-aci.py: No such file or directory

Oops, this is what I need:
$ hg update
4 files updated, 0 files merged, 0 files removed, 0 files unresolved

I've made this mistake more than once now, is there a better way?