Confusing `hg add` + `hg remove` behavior

[Gregory Szorc]

One of my coworkers just blogged about confusing behavior w.r.t. performing
a `hg remove` on a file that was `hg add`ed but not yet committed:
http://code.v.igoro.us/posts/2016/09/user-guidance-vs-dwim.html

Is there room to change the behavior of `hg remove` to behave more like `hg
forget` in this scenario? Or is the best we can do a wording change?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160901/c82c98a1/attachment.html>