un-add?

[Ted Pavlic]

> ... will remove the file x from the wworking tree. This may or may not

No, it won't. See "hg help rm."

=====
     The following table details the behavior of remove for different file
     states (columns) and option combinations (rows). The file states are
     Added, Clean, Modified and Missing (as reported by hg status). The
     actions are Warn, Remove (from branch) and Delete (from disk).

            A  C  M  !
     none   W  RD W  R
     -f     R  RD RD R
     -A     W  W  W  R
     -Af    R  R  R  R
=====

As you can see, "-f" with "A" (as in this case) only does "R".


--Ted




-- 
Ted Pavlic <ted at tedpavlic.com>

   Please visit my ALS association page:
         http://web.alsa.org/goto/tedpavlic
   My family appreciates your support in the fight to defeat ALS.