Reorganizing a live tree

[Kenneth Porter]

If I move a file (say, to a new subdirectory) and commit, and another user 
then edits the file from a pre-move WC, what happens when he updates his 
WC? Do his edits get merged to the file in the new location?