I use Subversion mainly to synchronize work between two computers I use on a daily basis (and as a backup, since I have a checked-out copy of the repository on each computer). I keep the main repository on a USB flashdrive.

I recently came across the following error when trying to commit a current working copy (and both working copies, one on each computer, are identical now):

! C career\UVaOnlineJudge\Log.doc
local delete, incoming delete upon update
! C career\UVaOnlineJudge\102\Main.class
local delete, incoming delete upon update

Without going into more detail about what I did to get the repository out of synch, my question is more general. What does “local delete, incoming delete upon update” mean? What is Subversion expecting that I’m not giving it?