ThomasAH: except that hg remove records R in dirstate. Since hg update without
-C keeps all dirstate changes, it shouldn't remove that, either.